Move AcceleratorController from WmShell to Shell

chrome/browser/ui/ash/palette_delegate_chromeos.cc

 // Copyright 2016 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/palette_delegate_chromeos.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
+#include "ash/aura/wm_shell_aura.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/utility/screenshot_controller.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/note_taking_helper.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 107 matching lines @@
 }
 
 bool PaletteDelegateChromeOS::ShouldShowPalette() {
   if (!profile_)
     return false;
 
   return profile_->GetPrefs()->GetBoolean(prefs::kEnableStylusTools);
 }
 
 void PaletteDelegateChromeOS::TakeScreenshot() {
-  auto* screenshot_delegate = ash::Shell::GetInstance()
+  auto* screenshot_delegate = ash::WmShellAura::Get()
                                   ->accelerator_controller_delegate()
                                   ->screenshot_delegate();
   screenshot_delegate->HandleTakeScreenshotForAllRootWindows();
 }
 
 void PaletteDelegateChromeOS::TakePartialScreenshot(const base::Closure& done) {
   auto* screenshot_controller =
       ash::Shell::GetInstance()->screenshot_controller();
-  auto* screenshot_delegate = ash::Shell::GetInstance()
+  auto* screenshot_delegate = ash::WmShellAura::Get()
                                   ->accelerator_controller_delegate()
                                   ->screenshot_delegate();
 
   screenshot_controller->set_pen_events_only(true);
   screenshot_controller->StartPartialScreenshotSession(
       screenshot_delegate, false /* draw_overlay_immediately */);
   screenshot_controller->set_on_screenshot_session_done(
       base::Bind(&PaletteDelegateChromeOS::OnPartialScreenshotDone,
                  weak_factory_.GetWeakPtr(), done));
 }
 
 void PaletteDelegateChromeOS::CancelPartialScreenshot() {
   ash::Shell::GetInstance()->screenshot_controller()->CancelScreenshotSession();
 }
 
 }  // namespace chromeos