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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/screen_ash.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
« ash/root_window_controller.cc ('K') | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | ash/wm/gestures/long_press_affordance_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_ash.cc
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
index 31c5bcc6dc3413241d00a06eea5ff14a19a3e3b0..b0ade929805040de8a2fec943be5a17687c1097c 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);
« ash/root_window_controller.cc ('K') | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | ash/wm/gestures/long_press_affordance_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698