summaryrefslogtreecommitdiffstats
path: root/content/app/content_main_runner.cc
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2014-10-23 11:57:35 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-23 18:57:49 +0000
commitaaa54ca8dc57118f0f81cf51198adb879ca6bfcc (patch)
tree48e43ed9f4b927cd83c3c5f36396b61bc198d645 /content/app/content_main_runner.cc
parentb78241aa63cc312c4c9fbee134347e75c31e2333 (diff)
downloadchromium_src-aaa54ca8dc57118f0f81cf51198adb879ca6bfcc.zip
chromium_src-aaa54ca8dc57118f0f81cf51198adb879ca6bfcc.tar.gz
chromium_src-aaa54ca8dc57118f0f81cf51198adb879ca6bfcc.tar.bz2
remove ui/base/win/dpi_setup.cc
Unnecessary wrapper. TBR=jam@chromium.org R=sky@chromium.org BUG=143619 Review URL: https://codereview.chromium.org/672583003 Cr-Commit-Position: refs/heads/master@{#300923}
Diffstat (limited to 'content/app/content_main_runner.cc')
-rw-r--r--content/app/content_main_runner.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 8ebce62..9031eef 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -78,7 +78,6 @@
#include "base/strings/string_number_conversions.h"
#include "ui/base/win/atl_module.h"
-#include "ui/base/win/dpi_setup.h"
#include "ui/gfx/win/dpi.h"
#elif defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
@@ -634,7 +633,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
}
}
if (init_device_scale_factor)
- ui::win::InitDeviceScaleFactor();
+ gfx::InitDeviceScaleFactor(gfx::GetDPIScale());
#endif
if (!GetContentClient())