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

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 10184012: Revert 133468 - Fix wallpaper fade animation flashing problem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « no previous file | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_controller.cc
===================================================================
--- ash/desktop_background/desktop_background_controller.cc (revision 133513)
+++ ash/desktop_background/desktop_background_controller.cc (working copy)
@@ -29,11 +29,14 @@
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);
- internal::CreateDesktopBackground(GetWallpaper(index),
- GetWallpaperInfo(index).layout);
+ root_window_layout->SetBackgroundWidget(
+ internal::CreateDesktopBackground(GetWallpaper(index),
+ GetWallpaperInfo(index).layout));
desktop_background_mode_ = BACKGROUND_IMAGE;
}
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698