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

Unified Diff: ui/base/layout.cc

Issue 10828052: Makes ui::GetSupportedScaleFactors available on platforms other than Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_mac.mm » ('j') | no next file with comments »
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 b55a0ab08db748d16b54e363601041edcfeedf8d..6f98c9d3c3e6ada5fb05043a89a44b64b90f35ad 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -4,6 +4,7 @@
#include "ui/base/layout.h"
+#include <algorithm>
#include <cmath>
#include <limits>
@@ -22,6 +23,10 @@
#include "ui/base/touch/touch_factory.h"
#endif // defined(USE_AURA) && defined(USE_X11)
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif
+
#if defined(OS_WIN)
#include "base/win/metro.h"
#include <Windows.h>
@@ -78,6 +83,21 @@ bool UseTouchOptimizedUI() {
const float kScaleFactorScales[] = {1.0, 2.0};
const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
+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(OS_MACOSX) && defined(ENABLE_HIDPI)
+ if (base::mac::IsOSLionOrLater())
+ supported_scale_factors->push_back(ui::SCALE_FACTOR_200P);
+#elif defined(USE_ASH)
+ supported_scale_factors->push_back(ui::SCALE_FACTOR_200P);
+#endif
+ }
+ return *supported_scale_factors;
+}
+
} // namespace
namespace ui {
@@ -116,6 +136,28 @@ float GetScaleFactorScale(ScaleFactor scale_factor) {
return kScaleFactorScales[scale_factor];
}
+std::vector<ScaleFactor> GetSupportedScaleFactors() {
+ return GetSupportedScaleFactorsInternal();
+}
+
+bool IsScaleFactorSupported(ScaleFactor scale_factor) {
+ const std::vector<ScaleFactor>& supported =
+ GetSupportedScaleFactorsInternal();
+ return std::find(supported.begin(), supported.end(), scale_factor) !=
+ supported.end();
+}
+
+namespace test {
+
+void SetSupportedScaleFactors(
+ const std::vector<ui::ScaleFactor>& scale_factors) {
+ std::vector<ui::ScaleFactor>& supported_scale_factors =
+ GetSupportedScaleFactorsInternal();
+ supported_scale_factors = scale_factors;
+}
+
+} // namespace test
+
#if !defined(OS_MACOSX)
ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view) {
#if defined(USE_AURA) && !defined(OS_WIN)
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698