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

Unified Diff: ash/wm/common/window_resizer.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/common/root_window_finder.cc ('k') | ash/wm/common/window_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/common/window_resizer.cc
diff --git a/ash/wm/common/window_resizer.cc b/ash/wm/common/window_resizer.cc
index d1095a264e5cc93c4b3a853cf21695ddc129e714..b07c96c7643c035499ae7725aadc6a1537aea56c 100644
--- a/ash/wm/common/window_resizer.cc
+++ b/ash/wm/common/window_resizer.cc
@@ -11,9 +11,9 @@
#include "ash/wm/common/wm_window.h"
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_types.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
namespace ash {
@@ -191,8 +191,8 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
// Use a pointer location (matching the logic in DragWindowResizer) to
// calculate the target display after the drag.
- const gfx::Display& display =
- gfx::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
+ const display::Display& display =
+ display::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
DockedWindowLayoutManager* dock_layout = DockedWindowLayoutManager::Get(
wm::GetRootWindowMatching(near_passed_location));
« no previous file with comments | « ash/wm/common/root_window_finder.cc ('k') | ash/wm/common/window_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698