| Index: ash/shell.cc
 | 
| diff --git a/ash/shell.cc b/ash/shell.cc
 | 
| index e7e58d454ad2dbda5ea3c06a0f7bb4fb81ef8b5b..8600cd4dd1bc1db9292e8505574c46fd1ada1644 100644
 | 
| --- a/ash/shell.cc
 | 
| +++ b/ash/shell.cc
 | 
| @@ -554,6 +554,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:
 | 
|  
 | 
| @@ -919,11 +925,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);
 | 
| 
 |