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

Unified Diff: ui/compositor/test/test_suite.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: constants 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
Index: ui/compositor/test/test_suite.cc
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index d98f52da63f85aa9866085db991bbecc3e4106dc..569fc8eb4b54e435f74b130a427e33a7847cf15d 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -8,12 +8,10 @@
#include "base/message_loop/message_loop.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_switches.h"
+#include "ui/gfx/dpi.h"
#include "ui/gfx/gfx_paths.h"
#include "ui/gl/gl_surface.h"
-#if defined(OS_WIN)
-#include "ui/gfx/win/dpi.h"
-#endif
namespace ui {
namespace test {
@@ -29,7 +27,7 @@ void CompositorTestSuite::Initialize() {
gfx::RegisterPathProvider();
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
gfx::InitDeviceScaleFactor(1.0f);
#endif
« no previous file with comments | « ui/base/win/hwnd_subclass.cc ('k') | ui/events/win/events_win.cc » ('j') | ui/gfx/dpi.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698