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

Unified Diff: ui/display/screen.cc

Issue 2688413007: Add display::GetDisplayNearestView (Closed)
Patch Set: add missing files Created 3 years, 10 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: ui/display/screen.cc
diff --git a/ui/display/screen.cc b/ui/display/screen.cc
index f77133ace84ee5ddf29a8fa9be27130dbfabc3d0..8a356d2dae1c185549d3d8ab1ed634a98dc8164f 100644
--- a/ui/display/screen.cc
+++ b/ui/display/screen.cc
@@ -6,6 +6,7 @@
#include "ui/display/display.h"
#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/view_util.h"
tapted 2017/02/15 00:36:10 is this needed?
Jinsuk Kim 2017/02/16 10:11:25 Removed.
namespace display {
@@ -34,15 +35,15 @@ void Screen::SetScreenInstance(Screen* instance) {
g_screen = instance;
}
-gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeView view,
+gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeWindow window,
const gfx::Rect& screen_rect) const {
- float scale = GetDisplayNearestWindow(view).device_scale_factor();
+ float scale = GetDisplayNearestWindow(window).device_scale_factor();
return ScaleToEnclosingRect(screen_rect, 1.0f / scale);
}
-gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeView view,
+gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeWindow window,
const gfx::Rect& dip_rect) const {
- float scale = GetDisplayNearestWindow(view).device_scale_factor();
+ float scale = GetDisplayNearestWindow(window).device_scale_factor();
return ScaleToEnclosingRect(dip_rect, scale);
}

Powered by Google App Engine
This is Rietveld 408576698