content/test/content_test_suite.cc - Issue 659883002: Enable hidpi on Linux, refactor a bit on Windows to share

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/content_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: 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:

Index: content/test/content_test_suite.cc

diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc

index 4b7083ab21bcb50dd2d3703bfecf1353a10f0217..f71feb127accfae13c63abc2a744fd627f452b4a 100644

--- a/content/test/content_test_suite.cc

+++ b/content/test/content_test_suite.cc

@@ -11,10 +11,7 @@

#include "content/public/test/test_content_client_initializer.h"

#include "gpu/config/gpu_util.h"

#include "testing/gtest/include/gtest/gtest.h"

-#if defined(OS_WIN)

-#include "ui/gfx/win/dpi.h"

-#endif

+#include "ui/gfx/dpi.h"

#if defined(OS_MACOSX)

#include "base/mac/scoped_nsautorelease_pool.h"

@@ -65,7 +62,7 @@ void ContentTestSuite::Initialize() {

base::mac::ScopedNSAutoreleasePool autorelease_pool;

#endif

-#if defined(OS_WIN)

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))

gfx::InitDeviceScaleFactor(1.0f);

#endif