Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 8a0f615d8ec157f1f50846356d45bfbb6ec1db5a..29e6e2b80099265ba6dbe17a3fdbfb5fc6937afe 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -19,6 +19,7 @@
 #include "ui/gfx/insets.h"
 
 class CommandLine;
+class SkBitmap;
 
 namespace aura {
 class EventFilter;
@@ -40,6 +41,7 @@ class Widget;
 namespace ash {
 
 class AcceleratorController;
+class DesktopBackgroundController;
 class Launcher;
 class NestedDispatcherController;
 class PowerButtonController;
@@ -77,11 +79,6 @@ class WorkspaceController;
 // takes ownership of the Shell.
 class ASH_EXPORT Shell {
  public:
-  enum BackgroundMode {
-    BACKGROUND_IMAGE,
-    BACKGROUND_SOLID_COLOR
-  };
-
   enum Direction {
     FORWARD,
     BACKWARD
@@ -117,8 +114,8 @@ class ASH_EXPORT Shell {
   // Get the singleton RootWindow used by the Shell.
   static aura::RootWindow* GetRootWindow();
 
-  BackgroundMode desktop_background_mode() const {
-    return desktop_background_mode_;
+  internal::RootWindowLayoutManager* root_window_layout() const {
+    return root_window_layout_;
   }
 
   aura::Window* GetContainer(int container_id);
@@ -135,9 +132,6 @@ class ASH_EXPORT Shell {
   // Toggles app list.
   void ToggleAppList();
 
-  // Sets the desktop background mode.
-  void SetDesktopBackgroundMode(BackgroundMode mode);
-
   // Returns true if the screen is locked.
   bool IsScreenLocked() const;
 
@@ -176,6 +170,9 @@ class ASH_EXPORT Shell {
   internal::PartialScreenshotEventFilter* partial_screenshot_filter() {
     return partial_screenshot_filter_.get();
   }
+  DesktopBackgroundController* desktop_background_controller() {
+    return desktop_background_controller_.get();
+  }
   PowerButtonController* power_button_controller() {
     return power_button_controller_.get();
   }
@@ -263,6 +260,7 @@ class ASH_EXPORT Shell {
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
+  scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
@@ -287,9 +285,6 @@ class ASH_EXPORT Shell {
 
   ObserverList<ShellObserver> observers_;
 
-  // Can change at runtime.
-  BackgroundMode desktop_background_mode_;
-
   // Owned by aura::RootWindow, cached here for type safety.
   internal::RootWindowLayoutManager* root_window_layout_;