| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 61379d587dbbeef3f3137f90b83b5ea7d2beec5b..38437f3f5aa6f1c313640e71718cd64e521e6f32 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -553,6 +553,12 @@ void Shell::SetIsBrowserProcessWithMash() {
|
| g_is_browser_process_with_mash = true;
|
| }
|
|
|
| +void Shell::OnAppListVisibilityChanged(bool visible,
|
| + aura::Window* root_window) {
|
| + for (auto& observer : shell_observers_)
|
| + observer.OnAppListVisibilityChanged(visible, root_window);
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Shell, private:
|
|
|
| @@ -913,11 +919,9 @@ void Shell::Init(const ShellInitParams& init_params) {
|
| if (!display_initialized)
|
| display_manager_->InitDefaultDisplay();
|
|
|
| - // TODO(sky): move this to chrome for mash. http://crbug.com/729824.
|
| - if (ShouldEnableSimplifiedDisplayManagement())
|
| + if (config == Config::CLASSIC) {
|
| display_manager_->RefreshFontParams();
|
|
|
| - if (config == Config::CLASSIC) {
|
| aura::Env::GetInstance()->set_context_factory(init_params.context_factory);
|
| aura::Env::GetInstance()->set_context_factory_private(
|
| init_params.context_factory_private);
|
|
|