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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/demo/demo_main.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 | « ui/app_list/views/apps_grid_view.cc ('k') | ui/aura/remote_window_tree_host_win.cc » ('j') | ui/gfx/dpi.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index ec5ea52417e6567b7441b0f7715617680122c5da..1861808f98f84415664cea4f77071c93b1148c82 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -20,6 +20,7 @@
#include "ui/compositor/test/in_process_context_factory.h"
#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/dpi.h"
#include "ui/gfx/rect.h"
#include "ui/gl/gl_surface.h"
@@ -27,10 +28,6 @@
#include "ui/gfx/x/x11_connection.h"
#endif
-#if defined(OS_WIN)
-#include "ui/gfx/win/dpi.h"
-#endif
-
namespace {
// Trivial WindowDelegate implementation that draws a colored background.
@@ -116,7 +113,7 @@ int DemoMain() {
gfx::GLSurface::InitializeOneOff();
-#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/app_list/views/apps_grid_view.cc ('k') | ui/aura/remote_window_tree_host_win.cc » ('j') | ui/gfx/dpi.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698