| Index: ash/app_list/app_list_presenter_delegate.cc
|
| diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc
|
| index 0bbb1c18acfe2b35a5501b6ce39a07356125bfe2..01b2bcc52269651e19473af14eefae7b9fea4f0a 100644
|
| --- a/ash/app_list/app_list_presenter_delegate.cc
|
| +++ b/ash/app_list/app_list_presenter_delegate.cc
|
| @@ -89,13 +89,13 @@ void AppListPresenterDelegate::Init(app_list::AppListView* view,
|
| int current_apps_page) {
|
| // App list needs to know the new shelf layout in order to calculate its
|
| // UI layout when AppListView visibility changes.
|
| - ash::Shell::GetPrimaryRootWindowController()
|
| + Shell::GetPrimaryRootWindowController()
|
| ->GetShelfLayoutManager()
|
| ->UpdateAutoHideState();
|
| view_ = view;
|
| aura::Window* root_window =
|
| ShellPort::Get()->GetRootWindowForDisplayId(display_id);
|
| - aura::Window* container = GetRootWindowController(root_window)
|
| + aura::Window* container = RootWindowController::ForWindow(root_window)
|
| ->GetContainer(kShellWindowId_AppListContainer);
|
|
|
| view->Initialize(container, current_apps_page);
|
| @@ -185,7 +185,7 @@ void AppListPresenterDelegate::ProcessLocatedEvent(ui::LocatedEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| if (target) {
|
| RootWindowController* root_controller =
|
| - GetRootWindowController(target->GetRootWindow());
|
| + RootWindowController::ForWindow(target);
|
| if (root_controller) {
|
| aura::Window* menu_container =
|
| root_controller->GetContainer(kShellWindowId_MenuContainer);
|
|
|