| Index: ash/desktop_background/desktop_background_controller.cc
|
| diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
|
| index 711128d9569d9c93c69ee7609341067a31426220..f6b56fd07a8cbb414f65d1662a2830edefa74d7c 100644
|
| --- a/ash/desktop_background/desktop_background_controller.cc
|
| +++ b/ash/desktop_background/desktop_background_controller.cc
|
| @@ -29,14 +29,11 @@ DesktopBackgroundController::~DesktopBackgroundController() {
|
| void DesktopBackgroundController::SetDesktopBackgroundImageMode() {
|
| internal::RootWindowLayoutManager* root_window_layout =
|
| Shell::GetInstance()->root_window_layout();
|
| - if (root_window_layout->background_widget())
|
| - root_window_layout->background_widget()->Hide();
|
| int index = Shell::GetInstance()->user_wallpaper_delegate()->
|
| GetUserWallpaperIndex();
|
| root_window_layout->SetBackgroundLayer(NULL);
|
| - root_window_layout->SetBackgroundWidget(
|
| - internal::CreateDesktopBackground(GetWallpaper(index),
|
| - GetWallpaperInfo(index).layout));
|
| + internal::CreateDesktopBackground(GetWallpaper(index),
|
| + GetWallpaperInfo(index).layout);
|
| desktop_background_mode_ = BACKGROUND_IMAGE;
|
| }
|
|
|
|
|