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/display | |
| 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/display')
| -rw-r--r-- | ash/display/display_controller.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 7475379..2141e0c 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -19,7 +19,6 @@ #include "ash/screen_ash.h" #include "ash/shell.h" #include "ash/wm/coordinate_conversion.h" -#include "ash/wm/property_util.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "third_party/skia/include/utils/SkMatrix44.h" @@ -260,7 +259,7 @@ void DisplayController::Shutdown() { for (std::map<int64, aura::RootWindow*>::const_reverse_iterator it = root_windows_.rbegin(); it != root_windows_.rend(); ++it) { internal::RootWindowController* controller = - GetRootWindowController(it->second); + internal::GetRootWindowController(it->second); DCHECK(controller); delete controller; } @@ -322,7 +321,7 @@ void DisplayController::CloseChildWindows() { root_windows_.begin(); it != root_windows_.end(); ++it) { aura::RootWindow* root_window = it->second; internal::RootWindowController* controller = - GetRootWindowController(root_window); + internal::GetRootWindowController(root_window); if (controller) { controller->CloseChildWindows(); } else { @@ -339,7 +338,7 @@ std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() { for (std::map<int64, aura::RootWindow*>::const_iterator it = root_windows_.begin(); it != root_windows_.end(); ++it) { DCHECK(it->second); - if (GetRootWindowController(it->second)) + if (internal::GetRootWindowController(it->second)) windows.push_back(it->second); } return windows; @@ -360,7 +359,7 @@ DisplayController::GetAllRootWindowControllers() { for (std::map<int64, aura::RootWindow*>::const_iterator it = root_windows_.begin(); it != root_windows_.end(); ++it) { internal::RootWindowController* controller = - GetRootWindowController(it->second); + internal::GetRootWindowController(it->second); if (controller) controllers.push_back(controller); } @@ -684,7 +683,7 @@ void DisplayController::OnDisplayRemoved(const gfx::Display& display) { GetDisplayManager()->GetDisplayForId(primary_display_id)); } internal::RootWindowController* controller = - GetRootWindowController(root_to_delete); + internal::GetRootWindowController(root_to_delete); DCHECK(controller); controller->MoveWindowsTo(GetPrimaryRootWindow()); // Delete most of root window related objects, but don't delete |