| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 239df7d554e4ea1e3824c75cc953d951779ae6b4..219b3e4973ad88f4a612235e93d49dbd0382d165 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -17,6 +17,7 @@
|
| #include "ui/gfx/size.h"
|
|
|
| class CommandLine;
|
| +class SkBitmap;
|
|
|
| namespace aura {
|
| class EventFilter;
|
| @@ -40,6 +41,7 @@ namespace ash {
|
| class AcceleratorController;
|
| class AudioController;
|
| class BrightnessController;
|
| +class DesktopBackgroundController;
|
| class Launcher;
|
| class NestedDispatcherController;
|
| class PowerButtonController;
|
| @@ -147,8 +149,14 @@ class ASH_EXPORT Shell {
|
| // Toggles app list.
|
| void ToggleAppList();
|
|
|
| - // Sets the desktop background mode.
|
| - void SetDesktopBackgroundMode(BackgroundMode mode);
|
| + // Sets the desktop background wallpaper.
|
| + void SetDesktopBackgroundWallpaper(const SkBitmap& wallpaper);
|
| +
|
| + // Sets the desktop background (image mode).
|
| + void SetDesktopBackgroundImageMode(const SkBitmap& wallpaper);
|
| +
|
| + // Sets the desktop background (solid color mode).
|
| + void SetDesktopBackgroundSolidColorMode();
|
|
|
| // Returns true if the screen is locked.
|
| bool IsScreenLocked() const;
|
| @@ -186,6 +194,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();
|
| }
|
| @@ -282,6 +293,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_;
|
|
|