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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.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/window_util.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/multi_window_resize_controller.cc
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index afbe42df3bbfd9ab41de4389860c08e93d4bf716..972aa12ac364e19242b6069e1f0285ddfe3292d2 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -19,11 +19,11 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/hit_test.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/display/screen.h"
#include "ui/events/event_targeter.h"
#include "ui/events/event_utils.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image.h"
-#include "ui/gfx/screen.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -241,7 +241,8 @@ void MultiWindowResizeController::OnWindowDestroying(
MultiWindowResizeController::ResizeWindows
MultiWindowResizeController::DetermineWindowsFromScreenPoint(
aura::Window* window) const {
- gfx::Point mouse_location(gfx::Screen::GetScreen()->GetCursorScreenPoint());
+ gfx::Point mouse_location(
+ display::Screen::GetScreen()->GetCursorScreenPoint());
::wm::ConvertPointFromScreen(window, &mouse_location);
const int component =
window->delegate()->GetNonClientComponent(mouse_location);
@@ -477,7 +478,7 @@ void MultiWindowResizeController::CompleteResize() {
window_resizer_.reset();
// Mouse may still be over resizer, if not hide.
- gfx::Point screen_loc = gfx::Screen::GetScreen()->GetCursorScreenPoint();
+ gfx::Point screen_loc = display::Screen::GetScreen()->GetCursorScreenPoint();
if (!resize_widget_->GetWindowBoundsInScreen().Contains(screen_loc)) {
Hide();
} else {
« no previous file with comments | « ash/wm/window_util.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698