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

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 24020002: Move GetRootWindowController() to root_window_controller.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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') | ash/root_window_controller.cc » ('J')
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 1456defe3599a95c5024670ee1e9c56fa7ba06d0..d8348ebed4f7aa0c70d9a01223deeda053805e15 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -14,7 +14,6 @@
#include "ash/shell.h"
#include "ash/shell_factory.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/property_util.h"
#include "ash/wm/root_window_layout_manager.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -414,10 +413,11 @@ void DesktopBackgroundController::InstallDesktopController(
NOTREACHED();
return;
}
- GetRootWindowController(root_window)->SetAnimatingWallpaperController(
- new internal::AnimatingDesktopController(component));
+ internal::GetRootWindowController(root_window)->
+ SetAnimatingWallpaperController(
+ new internal::AnimatingDesktopController(component));
- component->StartAnimating(GetRootWindowController(root_window));
+ component->StartAnimating(internal::GetRootWindowController(root_window));
}
void DesktopBackgroundController::InstallDesktopControllerForAllWindows() {
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_view.cc » ('j') | ash/root_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698