| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 6eaa214c586221c3d84d5167f26e4eba598330f4..48257a929b94ad3a0b832b568bc7a92222e73050 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -84,7 +84,7 @@
|
| #include "base/bind.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/trace_event/trace_event.h"
|
| -#include "ui/app_list/shower/app_list_shower.h"
|
| +#include "ui/app_list/presenter/app_list_presenter.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/layout_manager.h"
|
| @@ -299,15 +299,15 @@ void Shell::ShowAppList(aura::Window* window) {
|
| // If the context window is not given, show it on the target root window.
|
| if (!window)
|
| window = GetTargetRootWindow();
|
| - delegate_->GetAppListShower()->Show(window);
|
| + delegate_->GetAppListPresenter()->Show(window);
|
| }
|
|
|
| void Shell::DismissAppList() {
|
| - delegate_->GetAppListShower()->Dismiss();
|
| + delegate_->GetAppListPresenter()->Dismiss();
|
| }
|
|
|
| void Shell::ToggleAppList(aura::Window* window) {
|
| - if (delegate_->GetAppListShower()->IsVisible()) {
|
| + if (delegate_->GetAppListPresenter()->IsVisible()) {
|
| DismissAppList();
|
| return;
|
| }
|
| @@ -316,7 +316,7 @@ void Shell::ToggleAppList(aura::Window* window) {
|
| }
|
|
|
| bool Shell::GetAppListTargetVisibility() const {
|
| - return delegate_->GetAppListShower()->GetTargetVisibility();
|
| + return delegate_->GetAppListPresenter()->GetTargetVisibility();
|
| }
|
|
|
| bool Shell::IsSystemModalWindowOpen() const {
|
|
|