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/screen_ash.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/screen_ash.cc')
| -rw-r--r-- | ash/screen_ash.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc index 31c5bcc..b0ade92 100644 --- a/ash/screen_ash.cc +++ b/ash/screen_ash.cc @@ -10,7 +10,6 @@ #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" -#include "ash/wm/property_util.h" #include "ash/wm/coordinate_conversion.h" #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" @@ -44,7 +43,7 @@ gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) { // static gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) { - if (GetRootWindowController(window->GetRootWindow())->shelf()) + if (internal::GetRootWindowController(window->GetRootWindow())->shelf()) return GetDisplayWorkAreaBoundsInParent(window); else return GetDisplayBoundsInParent(window); |