Chromium Code Reviews| 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) |
|
Nico
2012/09/14 00:52:19
How does HiDPI code work on iOS? Seems like you'd
rohitrao (ping after 24h)
2012/09/14 01:07:18
This bit is TBD; I still need to work out exactly
Nico
2012/09/14 01:13:37
SGTM. Can you add a "TODO: Figure out ios" comment
rohitrao (ping after 24h)
2012/09/14 01:30:29
Added a TODO. I'll be looking at this either tomo
|
| if (base::mac::IsOSLionOrLater()) |
| supported_scale_factors->push_back(ui::SCALE_FACTOR_200P); |
| #elif defined(OS_WIN) && defined(ENABLE_HIDPI) |