| Index: ash/wm/app_list_controller.cc
|
| diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
|
| index a6549c2c98973964ce416b7fb4eabc338cf3864f..68af3518b9c40e6edb71dd4ec0a520ba575f283e 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()));
|
| }
|
|
|