diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 14:43:01 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 14:43:01 +0000 |
| commit | 7da9c4cf0e9f949dd1f2a3322118344c5d7369c7 (patch) | |
| tree | ec91a8b4f8a211bc557a9bb28b61c17f90749d02 /content/browser/renderer_host/dip_util.cc | |
| parent | c5ba8a93317a8363bcaf4b17cab96a296782803c (diff) | |
| download | chromium_src-7da9c4cf0e9f949dd1f2a3322118344c5d7369c7.zip chromium_src-7da9c4cf0e9f949dd1f2a3322118344c5d7369c7.tar.gz chromium_src-7da9c4cf0e9f949dd1f2a3322118344c5d7369c7.tar.bz2 | |
Rename gfx::Monitor to gfx::Display
BUG=130828
R=oshima@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10540091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/dip_util.cc')
| -rw-r--r-- | content/browser/renderer_host/dip_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/dip_util.cc b/content/browser/renderer_host/dip_util.cc index df0ec63..8a42e74 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; |