diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 06:29:54 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 06:29:54 +0000 |
| commit | 6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03 (patch) | |
| tree | b1188d06247a00f4ad2bfb33e48ff19d67e43ea8 /ash/desktop_background/desktop_background_controller.cc | |
| parent | 3ea429189890fd2fc2f71760c4ccb73373ffa9c7 (diff) | |
| download | chromium_src-6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03.zip chromium_src-6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03.tar.gz chromium_src-6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03.tar.bz2 | |
Move GetRootWindowController to root_window_controller.h
Remove unnecessary includes, forward decls
BUG=272460
Review URL: https://chromiumcodereview.appspot.com/24020002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background/desktop_background_controller.cc')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index 1456def..d8348eb 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() { |