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

Unified Diff: ui/base/layout.cc

Issue 10780010: Introduces ImageSkia::GetRepresentations() for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index ac4ee5502020a47dd3f9010eaf4d9ae4ae6b47af..2cf09db514665e0e0044a4b2d0a4f5fb158f4b02 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -73,17 +73,17 @@ bool UseTouchOptimizedUI() {
const float kScaleFactorScales[] = {1.0, 2.0};
const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
-#if defined(OS_MACOSX)
std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() {
static std::vector<ui::ScaleFactor>* supported_scale_factors =
new std::vector<ui::ScaleFactor>();
if (supported_scale_factors->empty()) {
supported_scale_factors->push_back(ui::SCALE_FACTOR_100P);
+#if defined(USE_ASH) || defined(OS_MACOSX)
supported_scale_factors->push_back(ui::SCALE_FACTOR_200P);
+#endif
}
return *supported_scale_factors;
}
-#endif // OS_MACOSX
} // namespace
@@ -123,7 +123,6 @@ float GetScaleFactorScale(ScaleFactor scale_factor) {
return kScaleFactorScales[scale_factor];
}
-#if defined(OS_MACOSX)
std::vector<ScaleFactor> GetSupportedScaleFactors() {
return GetSupportedScaleFactorsInternal();
}
@@ -142,6 +141,4 @@ void SetSupportedScaleFactors(
} // namespace test
-#endif // OS_MACOSX
-
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698