Chromium Code Reviews| Index: ash/shell.h |
| diff --git a/ash/shell.h b/ash/shell.h |
| index 4d70bbd0a61c944b9a61e1b7e2c360dc8322c4fb..9468587b9b9da7ca1aba5a3b1c9c07b16b241e60 100644 |
| --- a/ash/shell.h |
| +++ b/ash/shell.h |
| @@ -49,6 +49,7 @@ class SystemTrayDelegate; |
| class SystemTray; |
| class VideoDetector; |
| class WindowCycleController; |
| +class DesktopBackgroundController; |
|
flackr
2012/03/05 16:16:03
nit: Sort.
bshe
2012/03/06 01:33:27
Done.
|
| namespace internal { |
| class ActivationController; |
| @@ -184,6 +185,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(); |
| } |
| @@ -289,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_; |