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

Unified Diff: chrome/chrome_browser.gypi

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 | « chrome/browser/ui/webui/options2/options_ui2.cc ('k') | ui/resources/ui_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1fa0dd887d3aca235b6fab9242b4dca6fae1795f..fe05a4ceb1d610a868b210502a382e0241126be0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -407,6 +407,8 @@
'browser/chromeos/audio/audio_mixer.h',
'browser/chromeos/audio/audio_mixer_alsa.cc',
'browser/chromeos/audio/audio_mixer_alsa.h',
+ 'browser/chromeos/background/desktop_background_observer.cc',
+ 'browser/chromeos/background/desktop_background_observer.h',
'browser/chromeos/bluetooth/bluetooth_adapter.cc',
'browser/chromeos/bluetooth/bluetooth_adapter.h',
'browser/chromeos/bluetooth/bluetooth_device.cc',
@@ -3870,6 +3872,8 @@
'browser/ui/webui/options2/chromeos/pointer_handler2.h',
'browser/ui/webui/options2/chromeos/proxy_handler2.cc',
'browser/ui/webui/options2/chromeos/proxy_handler2.h',
+ 'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc',
+ 'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h',
'browser/ui/webui/options2/chromeos/stats_options_handler2.cc',
'browser/ui/webui/options2/chromeos/stats_options_handler2.h',
'browser/ui/webui/options2/chromeos/system_settings_provider2.cc',
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui2.cc ('k') | ui/resources/ui_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698