r141777 - in trunk/src/ash: . desktop_background

[osh...@chromium.org]

Author: osh...@chromium.org
Date: Tue Jun 12 16:06:38 2012
New Revision: 141777

Log:
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

Modified:
trunk/src/ash/desktop_background/desktop_background_controller.cc
trunk/src/ash/desktop_background/desktop_background_controller.h
trunk/src/ash/shell.cc

Modified: trunk/src/ash/desktop_background/desktop_background_controller.cc
==============================================================================
--- trunk/src/ash/desktop_background/desktop_background_controller.cc (original)
+++ trunk/src/ash/desktop_background/desktop_background_controller.cc Tue Jun 12 16:06:38 2012
@@ -85,13 +85,10 @@
DISALLOW_COPY_AND_ASSIGN(WallpaperOperation);
};

-DesktopBackgroundController::DesktopBackgroundController(
- aura::RootWindow* root_window)
- : root_window_(root_window),
- desktop_background_mode_(BACKGROUND_IMAGE),
+DesktopBackgroundController::DesktopBackgroundController()
+ : desktop_background_mode_(BACKGROUND_IMAGE),
previous_index_(-1),
weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
- DCHECK(root_window_);
}

DesktopBackgroundController::~DesktopBackgroundController() {
@@ -127,8 +124,9 @@
void DesktopBackgroundController::SetCustomWallpaper(
const gfx::ImageSkia& wallpaper,
WallpaperLayout layout) {
- GetRootWindowLayoutManager(root_window_)->SetBackgroundLayer(NULL);
- internal::CreateDesktopBackground(wallpaper, layout, root_window_);
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+ GetRootWindowLayoutManager(root_window)->SetBackgroundLayer(NULL);
+ internal::CreateDesktopBackground(wallpaper, layout, root_window);
desktop_background_mode_ = BACKGROUND_IMAGE;
}

@@ -149,21 +147,24 @@
// http://crbug.com/113445
ui::Layer* background_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
background_layer->SetColor(color);
- root_window_->GetChildById(
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+ Shell::GetContainer(
+ root_window,
internal::kShellWindowId_DesktopBackgroundContainer)->
layer()->Add(background_layer);
- GetRootWindowLayoutManager(root_window_)->SetBackgroundLayer(
+ GetRootWindowLayoutManager(root_window)->SetBackgroundLayer(
background_layer);
- GetRootWindowLayoutManager(root_window_)->SetBackgroundWidget(NULL);
+ GetRootWindowLayoutManager(root_window)->SetBackgroundWidget(NULL);
desktop_background_mode_ = BACKGROUND_SOLID_COLOR;
}

void DesktopBackgroundController::SetDesktopBackgroundImageMode(
scoped_refptr<WallpaperOperation> wo) {
- GetRootWindowLayoutManager(root_window_)->SetBackgroundLayer(NULL);
- if(wo->wallpaper()) {
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+ GetRootWindowLayoutManager(root_window)->SetBackgroundLayer(NULL);
+ if (wo->wallpaper()) {
internal::CreateDesktopBackground(
- *wo->wallpaper(), wo->wallpaper_layout(), root_window_);
+ *wo->wallpaper(), wo->wallpaper_layout(), root_window);
desktop_background_mode_ = BACKGROUND_IMAGE;
}
}
@@ -179,7 +180,8 @@

void DesktopBackgroundController::CreateEmptyWallpaper() {
gfx::ImageSkia dummy;
- internal::CreateDesktopBackground(dummy, CENTER, root_window_);
+ internal::CreateDesktopBackground(
+ dummy, CENTER, Shell::GetPrimaryRootWindow());
desktop_background_mode_ = BACKGROUND_IMAGE;
}


Modified: trunk/src/ash/desktop_background/desktop_background_controller.h
==============================================================================
--- trunk/src/ash/desktop_background/desktop_background_controller.h (original)
+++ trunk/src/ash/desktop_background/desktop_background_controller.h Tue Jun 12 16:06:38 2012
@@ -46,7 +46,7 @@
BACKGROUND_SOLID_COLOR
};

- explicit DesktopBackgroundController(aura::RootWindow* root_window);
+ DesktopBackgroundController();
virtual ~DesktopBackgroundController();

// Gets the desktop background mode.
@@ -91,8 +91,6 @@
// Called after wallpaper loaded successfully.
void OnWallpaperLoadCompleted(scoped_refptr<WallpaperOperation> wo);

- aura::RootWindow* root_window_;
-
// Can change at runtime.
BackgroundMode desktop_background_mode_;


Modified: trunk/src/ash/shell.cc
==============================================================================
--- trunk/src/ash/shell.cc (original)
+++ trunk/src/ash/shell.cc Tue Jun 12 16:06:38 2012
@@ -558,8 +558,7 @@
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())