summaryrefslogtreecommitdiffstats
path: root/ash/ash.gyp
diff options
context:
space:
mode:
authoralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 23:53:07 +0000
committeralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 23:53:07 +0000
commit3f4c26ecd470540a43b9d422408aad64e3fedf96 (patch)
treee504b8820bffcc2a4d103bfdb6030666e0f00b5c /ash/ash.gyp
parent19db94feaaa7e875d09ac8022e88aee455b88887 (diff)
downloadchromium_src-3f4c26ecd470540a43b9d422408aad64e3fedf96.zip
chromium_src-3f4c26ecd470540a43b9d422408aad64e3fedf96.tar.gz
chromium_src-3f4c26ecd470540a43b9d422408aad64e3fedf96.tar.bz2
Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager.
To simplify DesktopBackgroundController and allow customized default wallpapers, we need to move all "default" wallpaper loading to WallpaperManager. BUG=348136 TEST=unittests Review URL: https://codereview.chromium.org/215293003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
-rw-r--r--ash/ash.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index d14c6d8c..dc07d3c 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -756,6 +756,8 @@
'ash_resources',
],
'sources': [
+ 'desktop_background/desktop_background_controller_test_api.cc',
+ 'desktop_background/desktop_background_controller_test_api.h',
'shell/keyboard_controller_proxy_stub.cc',
'shell/keyboard_controller_proxy_stub.h',
'shell/toplevel_window.cc',