| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 1df6887fd1a8cd0619651af764c031bd1acdfb36..fe7cda3368a636e2e6f8c62bcf2a6c56bafdfe72 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,11 @@ 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->
|
| + desktop_background_controller()->GetUserWallpaper());
|
| + }
|
| return true;
|
| }
|
|
|
|
|