Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Address review Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ash/desktop_background/desktop_background_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ash/desktop_background/desktop_background_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698