diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
| commit | bf9cdb36cc79becab099c9f37eb80284fb203f45 (patch) | |
| tree | 4c9011f0aa08ac613027abd372cec3a3b613032b /ash/wm/app_list_controller.cc | |
| parent | fef72c1c9890633a237e06ccb0d0f4ce2ca6c9c1 (diff) | |
| download | chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.zip chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.gz chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.bz2 | |
Make GetRootWindow() return a Window instead of a RootWindow.
Also adds a typedef from RootWindow to WindowEventDispatcher, the eventual name of this type.
Adds a GetDispatcher() method that crawls up to the root Window and returns the WindowEventDispatcher.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/37733003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index a6549c2..68af351 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -163,7 +163,7 @@ void AppListController::SetVisible(bool visible, aura::Window* window) { // will be released with AppListView on close. app_list::AppListView* view = new app_list::AppListView( Shell::GetInstance()->delegate()->CreateAppListViewDelegate()); - aura::RootWindow* root_window = window->GetRootWindow(); + aura::Window* root_window = window->GetRootWindow(); aura::Window* container = GetRootWindowController(root_window)-> GetContainer(kShellWindowId_AppListContainer); if (ash::switches::UseAlternateShelfLayout()) { @@ -369,7 +369,7 @@ void AppListController::OnWidgetDestroying(views::Widget* widget) { //////////////////////////////////////////////////////////////////////////////// // AppListController, ShellObserver implementation: -void AppListController::OnShelfAlignmentChanged(aura::RootWindow* root_window) { +void AppListController::OnShelfAlignmentChanged(aura::Window* root_window) { if (view_) view_->SetBubbleArrow(GetBubbleArrow(view_->GetWidget()->GetNativeView())); } |