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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/test/blink_test_environment.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 | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | content/test/content_test_suite.cc » ('j') | ui/gfx/dpi.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/blink_test_environment.cc
diff --git a/content/test/blink_test_environment.cc b/content/test/blink_test_environment.cc
index b9655fef6357acbbd289f6359d380e6a029fa229..579e7737afc72db171ac8e8a279b24d4ebe6693e 100644
--- a/content/test/blink_test_environment.cc
+++ b/content/test/blink_test_environment.cc
@@ -18,12 +18,9 @@
#include "third_party/WebKit/public/web/WebCache.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
+#include "ui/gfx/dpi.h"
#include "url/url_util.h"
-#if defined(OS_WIN)
-#include "ui/gfx/win/dpi.h"
-#endif
-
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
#include "net/android/network_library.h"
@@ -100,7 +97,7 @@ void SetUpBlinkTestEnvironment() {
mock_cr_app::RegisterMockCrApp();
#endif
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
gfx::InitDeviceScaleFactor(1.0f);
#endif
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | content/test/content_test_suite.cc » ('j') | ui/gfx/dpi.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698