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

Unified Diff: ash/wm/coordinate_conversion.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: cros Created 4 years, 11 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
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ash/wm/default_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/coordinate_conversion.cc
diff --git a/ash/wm/coordinate_conversion.cc b/ash/wm/coordinate_conversion.cc
index c09448c39748d1ee658ac81d2d112107546ec726..e591f3f1b6e8b664307a6c4d2cfbcfc207c93f33 100644
--- a/ash/wm/coordinate_conversion.cc
+++ b/ash/wm/coordinate_conversion.cc
@@ -17,7 +17,7 @@ namespace wm {
aura::Window* GetRootWindowAt(const gfx::Point& point) {
const gfx::Display& display =
- Shell::GetScreen()->GetDisplayNearestPoint(point);
+ gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
DCHECK(display.is_valid());
// TODO(yusukes): Move coordinate_conversion.cc and .h to ui/aura/ once
// GetRootWindowForDisplayId() is moved to aura::Env.
@@ -27,7 +27,8 @@ aura::Window* GetRootWindowAt(const gfx::Point& point) {
}
aura::Window* GetRootWindowMatching(const gfx::Rect& rect) {
- const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(rect);
+ const gfx::Display& display =
+ gfx::Screen::GetScreen()->GetDisplayMatching(rect);
return Shell::GetInstance()
->window_tree_host_manager()
->GetRootWindowForDisplayId(display.id());
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ash/wm/default_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698