| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index c7b4b1f564ca9961ee3ec2028f8f750e7918b184..bbd8a8345c998f3de418e8b88ecdd9d830742308 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -324,7 +324,7 @@ Shell::~Shell() {
|
| activation_controller_.reset();
|
|
|
| #if defined(OS_CHROMEOS) && defined(USE_X11)
|
| - if (display_change_observer_)
|
| + if (display_change_observer_)
|
| output_configurator_->RemoveObserver(display_change_observer_.get());
|
| if (output_configurator_animation_)
|
| output_configurator_->RemoveObserver(output_configurator_animation_.get());
|
| @@ -691,6 +691,11 @@ aura::Window* Shell::GetAppListWindow() {
|
| return app_list_controller_.get() ? app_list_controller_->GetWindow() : NULL;
|
| }
|
|
|
| +void Shell::ShowAppListAppsGrid() {
|
| + if (app_list_controller_)
|
| + app_list_controller_->ShowAppsGrid();
|
| +}
|
| +
|
| bool Shell::IsSystemModalWindowOpen() const {
|
| if (simulate_modal_window_open_for_testing_)
|
| return true;
|
|
|