Use correct favicon scale factor on Android.

ui/base/layout.cc

Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 367dde33be2c539c9ecc1ac23f5939f18c2f79ce..fde6f2207b52724475211006948047ecd21aa780 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -64,7 +64,7 @@ bool UseTouchOptimizedUI() {
 }
 #endif  // defined(OS_WIN)
 
-const float kScaleFactorScales[] = {1.0f, 1.0f, 1.4f, 1.8f, 2.0f};
+const float kScaleFactorScales[] = {1.0f, 1.0f, 1.4f, 1.5f, 1.8f, 2.0f, 3.0f};
 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
                kScaleFactorScales_incorrect_size);
 const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
@@ -78,7 +78,18 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() {
     supported_scale_factors->push_back(SCALE_FACTOR_100P);
 #endif
 
-#if defined(OS_IOS)
+#if defined(OS_ANDROID)
+    const gfx::Display display =
+        gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
+    const float display_density = display.device_scale_factor();
+    for (int i = SCALE_FACTOR_100P; i < NUM_SCALE_FACTORS - 1; ++i) {

[Nico, 2013/01/18 01:27:33]

nit: I'd start with 0

[aruslan, 2013/01/18 03:21:07]

Discussed off-line; keeping as is.

+      if (display_density <= kScaleFactorScales[i]) {
+        if (i != SCALE_FACTOR_100P)

[Nico, 2013/01/18 01:27:33]

do you need to static_cast<ScaleFactor>(i) here?

[aruslan, 2013/01/18 03:21:07]

Done.

+          supported_scale_factors->push_back(static_cast<ScaleFactor>(i));
+        break;
+      }
+    }
+#elif defined(OS_IOS)
     gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
     if (display.device_scale_factor() > 1.0) {
       DCHECK_EQ(2.0, display.device_scale_factor());