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

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 10832340: Send NOTIFICATION_WALLPAPER_ANIMATION_FINISHED for solid background (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: one more OWNERS file Created 8 years, 4 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 | « ash/desktop_background/desktop_background_controller.h ('k') | chrome/browser/chromeos/background/OWNERS » ('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
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 3df47d5922b62deeda4148ac58d31e6b27d4a39b..f804dd8f8f1729c7cc3c1c5a00de8a9403f1c0a2 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -260,6 +260,11 @@ void DesktopBackgroundController::OnWallpaperLoadCompleted(
wallpaper_op_ = NULL;
}
+void DesktopBackgroundController::NotifyAnimationFinished() {
+ Shell* shell = Shell::GetInstance();
+ shell->user_wallpaper_delegate()->OnWallpaperAnimationFinished();
+}
+
ui::Layer* DesktopBackgroundController::SetColorLayerForContainer(
SkColor color,
aura::RootWindow* root_window,
@@ -269,6 +274,11 @@ ui::Layer* DesktopBackgroundController::SetColorLayerForContainer(
Shell::GetContainer(root_window,container_id)->
layer()->Add(background_layer);
+
+ MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(&DesktopBackgroundController::NotifyAnimationFinished,
+ weak_ptr_factory_.GetWeakPtr()));
+
return background_layer;
}
« no previous file with comments | « ash/desktop_background/desktop_background_controller.h ('k') | chrome/browser/chromeos/background/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698