content/app/content_main_runner.cc - Issue 672583003: remove ui/base/win/dpi_setup.cc

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/app/content_main_runner.cc

Issue 672583003: remove ui/base/win/dpi_setup.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dpi-cleanup-2

Patch Set: 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/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index 8ebce62667a619dbf346a0c783c974dc1d1da234..9031eefc15c0a95b99f1391e9fd2cbff762f580f 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -78,7 +78,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"

@@ -634,7 +633,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {

}

if (init_device_scale_factor)

- ui::win::InitDeviceScaleFactor();

+ gfx::InitDeviceScaleFactor(gfx::GetDPIScale());

sky 2014/10/23 04:19:13 I hate the inconsistency here. InitDeviceScaleFact

#endif

if (!GetContentClient())

« no previous file with comments | « no previous file | ui/base/BUILD.gn » ('j') | no next file with comments »