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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/screen_ash.cc

Issue 2035543004: Shuffles and renames ash/common/wm classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: random changes for chrome tests Created 4 years, 6 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/common/wm_window.h ('K') | « ash/desktop_background/desktop_background_widget_controller.cc ('k') | ash/drag_drop/drag_drop_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index 5e987f4216488c2da2a433a7ac284f4f368996d1..9c3314cb52f14768ae032c7ebe6ac554b64684eb 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -4,6 +4,7 @@
#include "ash/display/screen_ash.h"
+#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/root_window_finder.h"
#include "ash/display/display_manager.h"
#include "ash/display/window_tree_host_manager.h"
@@ -12,7 +13,6 @@
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
#include "base/logging.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
@@ -111,7 +111,7 @@ bool ScreenAsh::IsWindowUnderCursor(gfx::NativeWindow window) {
gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {
aura::Window* root_window =
- wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(point));
+ WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(point));
aura::client::ScreenPositionClient* position_client =
aura::client::GetScreenPositionClient(root_window);
« ash/common/wm_window.h ('K') | « ash/desktop_background/desktop_background_widget_controller.cc ('k') | ash/drag_drop/drag_drop_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698