summaryrefslogtreecommitdiffstats
path: root/ash/wm/app_list_controller.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 03:39:42 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 03:39:42 +0000
commit07481bea1f3c60d5ed41bbc650e4d620eaa05d88 (patch)
tree12543c65e470a3150add7d4cf9df18fb22b06950 /ash/wm/app_list_controller.cc
parentbbd8286c59f9c1eb79989aba4362d7cc75b7bbd5 (diff)
downloadchromium_src-07481bea1f3c60d5ed41bbc650e4d620eaa05d88.zip
chromium_src-07481bea1f3c60d5ed41bbc650e4d620eaa05d88.tar.gz
chromium_src-07481bea1f3c60d5ed41bbc650e4d620eaa05d88.tar.bz2
Rename RootWindowObserver::OnRootWindowResized to OnRootWindowHostResized, and
RootWindowObserver::OnRootWindowMoved to OnRootWindowHostMoved - Changed so that this is called only when host window's size is changed. - Remove old argument as it was RootWindow's size but not HostWindow's, and it's not used. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/16410015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
-rw-r--r--ash/wm/app_list_controller.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 02afc69..d9bf234 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -157,7 +157,7 @@ void AppListController::SetView(app_list::AppListView* view) {
widget->AddObserver(this);
Shell::GetInstance()->AddPreTargetHandler(this);
Launcher::ForWindow(widget->GetNativeWindow())->AddIconObserver(this);
- widget->GetNativeView()->GetRootWindow()->AddRootWindowObserver(this);
+ widget->GetNativeView()->GetRootWindow()->AddObserver(this);
aura::client::GetFocusClient(widget->GetNativeView())->AddObserver(this);
view_->ShowWhenReady();
@@ -172,7 +172,7 @@ void AppListController::ResetView() {
GetLayer(widget)->GetAnimator()->RemoveObserver(this);
Shell::GetInstance()->RemovePreTargetHandler(this);
Launcher::ForWindow(widget->GetNativeWindow())->RemoveIconObserver(this);
- widget->GetNativeView()->GetRootWindow()->RemoveRootWindowObserver(this);
+ widget->GetNativeView()->GetRootWindow()->RemoveObserver(this);
aura::client::GetFocusClient(widget->GetNativeView())->RemoveObserver(this);
view_ = NULL;
}
@@ -264,9 +264,10 @@ void AppListController::OnWindowFocused(aura::Window* gained_focus,
}
////////////////////////////////////////////////////////////////////////////////
-// AppListController, aura::RootWindowObserver implementation:
-void AppListController::OnRootWindowResized(const aura::RootWindow* root,
- const gfx::Size& old_size) {
+// AppListController, aura::WindowObserver implementation:
+void AppListController::OnWindowBoundsChanged(aura::Window* root,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) {
UpdateBounds();
}