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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Cleanup. 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:
View side-by-side diff with in-line comments
Download patch
« skia/ext/skia_utils_ios.mm ('K') | « skia/skia.gyp ('k') | ui/gfx/image/image.h » ('j') | ui/gfx/image/image.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« skia/ext/skia_utils_ios.mm ('K') | « skia/skia.gyp ('k') | ui/gfx/image/image.h » ('j') | ui/gfx/image/image.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698