ash/desktop_background/desktop_background_view.cc - Issue 11054005: ash: Display system background while loading wallpaper.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 11054005: ash: Display system background while loading wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win_aura compile, hopefully Created 8 years, 2 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:

Index: ash/desktop_background/desktop_background_view.cc

diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc

index 74dbb7224b6d87257b4d9ad05a641a455797e7f4..a787882224d483792a21903bb4c652c8fa739b49 100644

--- a/ash/desktop_background/desktop_background_view.cc

+++ b/ash/desktop_background/desktop_background_view.cc

@@ -9,6 +9,7 @@

#include "ash/ash_export.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/desktop_background/desktop_background_widget_controller.h"

+#include "ash/root_window_controller.h"

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/wm/window_animations.h"

@@ -47,6 +48,7 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,

// Overridden from ui::ImplicitAnimationObserver:

virtual void OnImplicitAnimationsCompleted() OVERRIDE {

ash::Shell* shell = ash::Shell::GetInstance();

+ shell->GetPrimaryRootWindowController()->HandleDesktopBackgroundVisible();

shell->user_wallpaper_delegate()->OnWallpaperAnimationFinished();

// Only removes old component when wallpaper animation finished. If we

// remove the old one too early, there will be a white flash during