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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (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
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 3c847896e7458efa754937499ad25e59e059c056..6439c44a05e4541da8051f5567d65e9cc9792cc9 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -29,10 +29,10 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/extension_function_dispatcher.h"
+#include "ui/display/screen.h"
#include "ui/events/event_constants.h"
#include "ui/events/gestures/gesture_recognizer.h"
#include "ui/gfx/geometry/point_conversions.h"
-#include "ui/gfx/screen.h"
#include "ui/views/event_monitor.h"
#include "ui/views/focus/view_storage.h"
#include "ui/views/widget/root_view.h"
@@ -457,7 +457,7 @@ gfx::Point TabDragController::GetWindowCreatePoint(
// If the cursor is outside the monitor area, move it inside. For example,
// dropping a tab onto the task bar on Windows produces this situation.
gfx::Rect work_area =
- gfx::Screen::GetScreen()->GetDisplayNearestPoint(origin).work_area();
+ display::Screen::GetScreen()->GetDisplayNearestPoint(origin).work_area();
gfx::Point create_point(origin);
if (!work_area.IsEmpty()) {
if (create_point.x() < work_area.x())
@@ -1638,7 +1638,7 @@ gfx::Rect TabDragController::CalculateDraggedBrowserBounds(
views::View::ConvertPointToWidget(source, &center);
gfx::Rect new_bounds(source->GetWidget()->GetRestoredBounds());
- gfx::Rect work_area = gfx::Screen::GetScreen()
+ gfx::Rect work_area = display::Screen::GetScreen()
->GetDisplayNearestPoint(last_point_in_screen_)
.work_area();
if (new_bounds.size().width() >= work_area.size().width() &&
@@ -1771,7 +1771,7 @@ gfx::Point TabDragController::GetCursorScreenPoint() {
}
#endif
- return gfx::Screen::GetScreen()->GetCursorScreenPoint();
+ return display::Screen::GetScreen()->GetCursorScreenPoint();
}
gfx::Vector2d TabDragController::GetWindowOffset(

Powered by Google App Engine
This is Rietveld 408576698