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

Unified Diff: content/browser/renderer_host/dip_util.cc

Issue 10540091: Rename gfx::Monitor to gfx::Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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: content/browser/renderer_host/dip_util.cc
diff --git a/content/browser/renderer_host/dip_util.cc b/content/browser/renderer_host/dip_util.cc
index df0ec63e9f7c4c7dfac5dcad896861559610c4ba..8a42e74fdb994680d45d691ebdd5756b2bf2226d 100644
--- a/content/browser/renderer_host/dip_util.cc
+++ b/content/browser/renderer_host/dip_util.cc
@@ -5,7 +5,7 @@
#include "content/browser/renderer_host/dip_util.h"
#include "content/public/browser/render_widget_host_view.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/screen.h"
@@ -19,9 +19,9 @@ float GetDIPScaleFactor(const RenderWidgetHostView* view) {
// TODO(pkotwicz): Fix this. (crbug.com/129409).
#if !defined(OS_MACOSX)
if (gfx::Screen::IsDIPEnabled()) {
- gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(
+ gfx::Display display = gfx::Screen::GetMonitorNearestWindow(
view ? view->GetNativeView() : NULL);
- return monitor.device_scale_factor();
+ return display.device_scale_factor();
}
#endif
return 1.0f;

Powered by Google App Engine
This is Rietveld 408576698