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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/app/content_main_runner.cc

Issue 659883002: Enable hidpi on Linux, refactor a bit on Windows to share Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resource bundle loading Created 6 years, 2 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 | « chrome/browser/ui/views/tabs/window_finder_win.cc ('k') | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | ui/gfx/dpi.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index bc33726b6e50cd3e7ea0db4076c7c668f682e716..008ee153b1f7fada40e2a994b982661aca16b272 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -49,6 +49,7 @@
#include "sandbox/win/src/sandbox_types.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/gfx/dpi.h"
#if defined(OS_ANDROID)
#include "content/public/common/content_descriptors.h"
@@ -78,8 +79,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"
#if !defined(OS_IOS)
@@ -634,7 +633,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
}
}
if (init_device_scale_factor)
- ui::win::InitDeviceScaleFactor();
+ gfx::InitDeviceScaleFactor(gfx::GetDPIScale());
#endif
if (!GetContentClient())
« no previous file with comments | « chrome/browser/ui/views/tabs/window_finder_win.cc ('k') | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | ui/gfx/dpi.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698