ui/base/layout.cc - Issue 10928093: Adds an iOS implementation of gfx::Image.

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: ui/base/layout.cc

Issue 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia

Patch Set: Grammar. Created 8 years, 3 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: ui/base/layout.cc

diff --git a/ui/base/layout.cc b/ui/base/layout.cc

index ffc70821eda5ad472cca9932ecc4c70d80a3848c..39c504e2368e58155e0afbafa3b9dfda1a32b5c9 100644

--- a/ui/base/layout.cc

+++ b/ui/base/layout.cc

@@ -19,7 +19,7 @@

#include "ui/compositor/compositor.h"

#endif // defined(USE_AURA) && !defined(OS_WIN)

-#if defined(OS_MACOSX)

+#if defined(OS_MACOSX) && !defined(OS_IOS)

#include "base/mac/mac_util.h"

#endif

@@ -70,7 +70,7 @@ std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() {

new std::vector<ui::ScaleFactor>();

if (supported_scale_factors->empty()) {

supported_scale_factors->push_back(ui::SCALE_FACTOR_100P);

-#if defined(OS_MACOSX) && defined(ENABLE_HIDPI)

+#if defined(OS_MACOSX) && !defined(OS_IOS) && defined(ENABLE_HIDPI)

if (base::mac::IsOSLionOrLater())

supported_scale_factors->push_back(ui::SCALE_FACTOR_200P);

#elif defined(OS_WIN) && defined(ENABLE_HIDPI)