Chromium Code Reviews| Index: ash/accelerators/accelerator_controller.cc |
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
| index 1df6887fd1a8cd0619651af764c031bd1acdfb36..bc3ecd9ba9c65d8063051a7cfe0bfe05c6d7730e 100644 |
| --- a/ash/accelerators/accelerator_controller.cc |
| +++ b/ash/accelerators/accelerator_controller.cc |
| @@ -4,6 +4,7 @@ |
| #include "ash/accelerators/accelerator_controller.h" |
| +#include "ash/desktop_background/desktop_background_controller.h" |
| #include "ash/caps_lock_delegate.h" |
| #include "ash/ime_control_delegate.h" |
| #include "ash/launcher/launcher.h" |
| @@ -199,9 +200,12 @@ bool HandleRotateScreen() { |
| bool HandleToggleDesktopBackgroundMode() { |
| ash::Shell* shell = ash::Shell::GetInstance(); |
| if (shell->desktop_background_mode() == ash::Shell::BACKGROUND_IMAGE) |
| - shell->SetDesktopBackgroundMode(ash::Shell::BACKGROUND_SOLID_COLOR); |
| - else |
| - shell->SetDesktopBackgroundMode(ash::Shell::BACKGROUND_IMAGE); |
| + shell->SetDesktopBackgroundSolidColorMode(); |
| + else { |
| + shell->SetDesktopBackgroundImageMode(shell-> |
|
flackr
2012/03/08 01:19:59
This would be a good place for just indenting 4 sp
bshe
2012/03/08 03:19:24
Done.
|
| + desktop_background_controller()-> |
| + GetUserWallpaper()); |
| + } |
| return true; |
| } |