summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 23:06:38 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 23:06:38 +0000
commit6e3b31b93a2c8128e3e74cd16a1b9e6d9ee13503 (patch)
tree14a3222e3898bba65e3abe8eaaeb3d1cc7d1c54b /ash/shell.cc
parent7173f73b803ff1a8532abab71cdc048fb6a28184 (diff)
downloadchromium_src-6e3b31b93a2c8128e3e74cd16a1b9e6d9ee13503.zip
chromium_src-6e3b31b93a2c8128e3e74cd16a1b9e6d9ee13503.tar.gz
chromium_src-6e3b31b93a2c8128e3e74cd16a1b9e6d9ee13503.tar.bz2
Remove root_window_ member from DesktopBackgroundController.
This will be changed to set the wallpaper on all root windows. BUG=123160 TEST=none Review URL: https://chromiumcodereview.appspot.com/10545142 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 565c169..63062980 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -558,8 +558,7 @@ void Shell::Init() {
status_area_widget_->Show();
// This controller needs to be set before SetupManagedWindowMode.
- desktop_background_controller_.reset(
- new DesktopBackgroundController(root_window));
+ desktop_background_controller_.reset(new DesktopBackgroundController());
if (delegate_.get())
user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
if (!user_wallpaper_delegate_.get())