Promotes a handful of members from WmShell to Shell

ash/common/accelerators/debug_commands.cc

 // Copyright 2013 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 "ash/common/accelerators/debug_commands.h"
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/toast/toast_data.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/debug_utils.h"
@@ skipping 68 matching lines @@
   flags.setStrokeWidth(10);
   flags.setStyle(cc::PaintFlags::kStroke_Style);
   flags.setBlendMode(SkBlendMode::kSrcOver);
   canvas.DrawRoundRect(gfx::Rect(image_size), 100, flags);
   return gfx::ImageSkia(canvas.ExtractImageRep());
 }
 
 void HandleToggleWallpaperMode() {
   static int index = 0;
   WallpaperController* wallpaper_controller =
-      WmShell::Get()->wallpaper_controller();
+      Shell::GetInstance()->wallpaper_controller();
   switch (++index % 4) {
     case 0:
       ash::WmShell::Get()->wallpaper_delegate()->InitializeWallpaper();
       break;
     case 1:
       wallpaper_controller->SetWallpaperImage(
           CreateWallpaperImage(SK_ColorRED, SK_ColorBLUE),
           wallpaper::WALLPAPER_LAYOUT_STRETCH);
       break;
     case 2:
@@ skipping 63 matching lines @@
     case DEBUG_PRINT_LAYER_HIERARCHY:
       HandlePrintLayerHierarchy();
       break;
     case DEBUG_PRINT_VIEW_HIERARCHY:
       HandlePrintViewHierarchy();
       break;
     case DEBUG_PRINT_WINDOW_HIERARCHY:
       HandlePrintWindowHierarchy();
       break;
     case DEBUG_SHOW_TOAST:
-      WmShell::Get()->toast_manager()->Show(
+      Shell::GetInstance()->toast_manager()->Show(
           ToastData("id", base::ASCIIToUTF16("Toast"), 5000 /* duration_ms */,
                     base::ASCIIToUTF16("Dismiss")));
       break;
     case DEBUG_TOGGLE_TOUCH_PAD:
       HandleToggleTouchpad();
       break;
     case DEBUG_TOGGLE_TOUCH_SCREEN:
       HandleToggleTouchscreen();
       break;
     case DEBUG_TOGGLE_TOUCH_VIEW:
       HandleToggleTouchView();
       break;
     case DEBUG_TOGGLE_WALLPAPER_MODE:
       HandleToggleWallpaperMode();
       break;
     case DEBUG_TRIGGER_CRASH:
       HandleTriggerCrash();
       break;
     default:
       break;
   }
 }
 
 }  // namespace debug
 }  // namespace ash