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

Unified Diff: ash/ash.gyp

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk 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 | « ash/accelerators/accelerator_controller.cc ('k') | ash/desktop_background/desktop_background_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index a5ee0830e68db621dc8edc1e44dbfbdca0dbf582..2626712d2992be8eada9d7548ca7eb235dd23034 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -67,6 +67,10 @@
'ash_switches.cc',
'ash_switches.h',
'caps_lock_delegate.h',
+ 'desktop_background/desktop_background_controller.cc',
+ 'desktop_background/desktop_background_controller.h',
+ 'desktop_background/desktop_background_resources.cc',
+ 'desktop_background/desktop_background_resources.h',
'desktop_background/desktop_background_view.cc',
'desktop_background/desktop_background_view.h',
'drag_drop/drag_drop_controller.cc',
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/desktop_background/desktop_background_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698