Skip to content

Commit

Permalink
Removes WindowAnimationDelegate. It was never needed.
Browse files Browse the repository at this point in the history
BUG=155179
TEST=none, code cleanup
R=ben@chromium.org

Review URL: https://codereview.chromium.org/11086057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161356 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sky@chromium.org committed Oct 11, 2012
1 parent 951a648 commit 37d8cae
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 82 deletions.
2 changes: 0 additions & 2 deletions ash/ash.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,6 @@
'wm/video_detector.h',
'wm/visibility_controller.cc',
'wm/visibility_controller.h',
'wm/window_animation_delegate.cc',
'wm/window_animation_delegate.h',
'wm/window_animations.cc',
'wm/window_animations.h',
'wm/window_cycle_controller.cc',
Expand Down
10 changes: 2 additions & 8 deletions ash/wm/visibility_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ash/wm/visibility_controller.h"

#include "ash/shell.h"
#include "ash/wm/window_animation_delegate.h"
#include "ash/wm/window_animations.h"
#include "ash/wm/window_properties.h"
#include "ui/aura/window.h"
Expand All @@ -17,13 +16,8 @@ namespace internal {
namespace {

bool ShouldAnimateWindow(aura::Window* window) {
if (!window->parent() || !window->parent()->GetProperty(
internal::kChildWindowVisibilityChangesAnimatedKey))
return false;

WindowAnimationDelegate* delegate =
WindowAnimationDelegate::GetDelegate(window->parent());
return !delegate || delegate->ShouldAnimateWindow(window);
return window->parent() && window->parent()->GetProperty(
internal::kChildWindowVisibilityChangesAnimatedKey);
}

} // namespace
Expand Down
32 changes: 0 additions & 32 deletions ash/wm/window_animation_delegate.cc

This file was deleted.

40 changes: 0 additions & 40 deletions ash/wm/window_animation_delegate.h

This file was deleted.

0 comments on commit 37d8cae

Please sign in to comment.