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

Unified Diff: ui/views/drag_utils.cc

Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanups 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 | « ui/views/corewm/tooltip_win.cc ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/drag_utils.cc
diff --git a/ui/views/drag_utils.cc b/ui/views/drag_utils.cc
index 9eae9f6472bf0a06d3e7b417f867dbf7213f7eec..f9e6c8be5ab607d7122bca1385181057e1780f2a 100644
--- a/ui/views/drag_utils.cc
+++ b/ui/views/drag_utils.cc
@@ -4,10 +4,10 @@
#include "ui/views/drag_utils.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
#include "ui/gfx/canvas.h"
-#include "ui/gfx/display.h"
#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/screen.h"
#include "ui/views/widget/widget.h"
namespace {
@@ -16,8 +16,8 @@ float GetDeviceScaleForNativeView(views::Widget* widget) {
float device_scale = 1.0f;
if (widget && widget->GetNativeView()) {
gfx::NativeView view = widget->GetNativeView();
- gfx::Display display =
- gfx::Screen::GetScreen()->GetDisplayNearestWindow(view);
+ display::Display display =
+ display::Screen::GetScreen()->GetDisplayNearestWindow(view);
device_scale = display.device_scale_factor();
}
return device_scale;
« no previous file with comments | « ui/views/corewm/tooltip_win.cc ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698