Promotes a handful of members from WmShell to Shell

ash/common/wallpaper/wallpaper_view.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 "ash/common/wallpaper/wallpaper_view.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
 #include "ash/common/wm/overview/window_selector_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 "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ skipping 93 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WallpaperView, views::View overrides:
 
 void WallpaperView::OnPaint(gfx::Canvas* canvas) {
   // Scale the image while maintaining the aspect ratio, cropping as necessary
   // to fill the wallpaper. Ideally the image should be larger than the largest
   // display supported, if not we will scale and center it if the layout is
   // wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED.
-  WallpaperController* controller = WmShell::Get()->wallpaper_controller();
+  WallpaperController* controller =
+      Shell::GetInstance()->wallpaper_controller();
   gfx::ImageSkia wallpaper = controller->GetWallpaper();
   wallpaper::WallpaperLayout layout = controller->GetWallpaperLayout();
 
   // Wallpapers with png format could be partially transparent. Fill the canvas
   // with black to make it opaque before painting the wallpaper.
   canvas->FillRect(GetLocalBounds(), SK_ColorBLACK);
 
   if (wallpaper.isNull())
     return;
 
@@ skipping 45 matching lines @@
   return true;
 }
 
 void WallpaperView::ShowContextMenuForView(views::View* source,
                                            const gfx::Point& point,
                                            ui::MenuSourceType source_type) {
   WmShell::Get()->ShowContextMenu(point, source_type);
 }
 
 views::Widget* CreateWallpaper(WmWindow* root_window, int container_id) {
-  WallpaperController* controller = WmShell::Get()->wallpaper_controller();
+  WallpaperController* controller =
+      Shell::GetInstance()->wallpaper_controller();
   WallpaperDelegate* wallpaper_delegate = WmShell::Get()->wallpaper_delegate();
 
   views::Widget* wallpaper_widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.name = "WallpaperView";
   if (controller->GetWallpaper().isNull())
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
       wallpaper_widget, container_id, &params);
@@ skipping 25 matching lines @@
     // Disable animation if transition to login screen from an empty background.
     wallpaper_window->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
   }
 
   WmWindow* container = root_window->GetChildByShellWindowId(container_id);
   wallpaper_widget->SetBounds(container->GetBounds());
   return wallpaper_widget;
 }
 
 }  // namespace ash