Make WmShellMus use classic types for mus

chrome/browser/ui/ash/ash_init.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_types.h"
@@ skipping 95 matching lines @@
 
   ash::Shell* shell = ash::Shell::GetInstance();
 
   ash::AcceleratorControllerDelegateAura* accelerator_controller_delegate =
       nullptr;
   if (chromeos::GetConfig() == ash::Config::CLASSIC) {
     accelerator_controller_delegate =
         ash::WmShellAura::Get()->accelerator_controller_delegate();
   } else if (chromeos::GetConfig() == ash::Config::MUS) {
     accelerator_controller_delegate =
-        ash::mus::WmShellMus::Get()->accelerator_controller_delegate_classic();
+        ash::mus::WmShellMus::Get()->accelerator_controller_delegate_mus();
   }
   if (accelerator_controller_delegate) {
     std::unique_ptr<ChromeScreenshotGrabber> screenshot_delegate =
         base::MakeUnique<ChromeScreenshotGrabber>();
     accelerator_controller_delegate->SetScreenshotDelegate(
         std::move(screenshot_delegate));
   }
   // TODO(flackr): Investigate exposing a blocking pool task runner to chromeos.
   chromeos::AccelerometerReader::GetInstance()->Initialize(
       content::BrowserThread::GetBlockingPool()
@@ skipping 22 matching lines @@
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
 AshInit::~AshInit() {
   // |window_manager_| deletes the Shell.
   if (!window_manager_ && ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();
     ash::ShellContentState::DestroyInstance();
   }
 }