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

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/insets.h"
 
 class CommandLine;
+class SkBitmap;
 
 namespace aura {
 class EventFilter;
 class RootWindow;
 class Window;
 }
 namespace gfx {
 class Point;
 class Rect;
 }
 namespace ui {
 class Layer;
 }
 namespace views {
 class NonClientFrameView;
 class Widget;
 }
 
 namespace ash {
 
 class AcceleratorController;
+class DesktopBackgroundController;
 class Launcher;
 class NestedDispatcherController;
 class PowerButtonController;
 class ScreenAsh;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTray;
 class VideoDetector;
 class WindowCycleController;
@@ skipping 17 matching lines @@
 class WorkspaceController;
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 //
 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
 // takes ownership of the Shell.
 class ASH_EXPORT Shell {
  public:
-  enum BackgroundMode {
-    BACKGROUND_IMAGE,
-    BACKGROUND_SOLID_COLOR
-  };
-
   enum Direction {
     FORWARD,
     BACKWARD
   };
 
   // Accesses private data from a Shell for testing.
   class ASH_EXPORT TestApi {
    public:
     explicit TestApi(Shell* shell);
 
@@ skipping 15 matching lines @@
   static Shell* GetInstance();
 
   // Returns true if the ash shell has been instantiated.
   static bool HasInstance();
 
   static void DeleteInstance();
 
   // 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);
   const aura::Window* GetContainer(int container_id) const;
 
   // Adds or removes |filter| from the RootWindowEventFilter.
   void AddRootWindowEventFilter(aura::EventFilter* filter);
   void RemoveRootWindowEventFilter(aura::EventFilter* filter);
   size_t GetRootWindowEventFilterCount() const;
 
   // Shows the background menu over |widget|.
   void ShowBackgroundMenu(views::Widget* widget, const gfx::Point& location);
 
   // Toggles app list.
   void ToggleAppList();
 
-  // Sets the desktop background mode.
-  void SetDesktopBackgroundMode(BackgroundMode mode);
-
   // Returns true if the screen is locked.
   bool IsScreenLocked() const;
 
   // Returns true if a modal dialog window is currently open.
   bool IsModalWindowOpen() const;
 
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget);
@@ skipping 18 matching lines @@
 
   internal::RootWindowEventFilter* root_filter() {
     return root_filter_;
   }
   internal::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   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();
   }
   VideoDetector* video_detector() {
     return video_detector_.get();
   }
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
   internal::FocusCycler* focus_cycler() {
@@ skipping 67 matching lines @@
   scoped_ptr<internal::AppList> app_list_;
 
   scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::WindowModalityController> window_modality_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::WorkspaceController> workspace_controller_;
   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_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
 
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
 
   // An event filter that pre-handles key events while the partial
   // screenshot UI is active.
   scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
 
 #if !defined(OS_MACOSX)
   // An event filter that pre-handles global accelerators.
   scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
 #endif
 
   // The shelf for managing the launcher and the status widget in non-compact
   // mode. Shell does not own the shelf. Instead, it is owned by container of
   // the status area.
   internal::ShelfLayoutManager* shelf_;
 
   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_;
 
   // Status area with clock, Wi-Fi signal, etc.
   views::Widget* status_widget_;
 
   // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
   // |status_widget_|).
   scoped_ptr<SystemTray> tray_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_