Use correct favicon scale factor on Android.

ui/base/layout.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/layout.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 46 matching lines @@
     } else if (switch_value != switches::kTouchOptimizedUIAuto) {
       LOG(ERROR) << "Invalid --touch-optimized-ui option: " << switch_value;
     }
   }
 
   // We use the touch layout only when we are running in Metro mode.
   return base::win::IsMetroProcess() && base::win::IsTouchEnabled();
 }
 #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);
 
 std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() {
   static std::vector<ScaleFactor>* supported_scale_factors =
       new std::vector<ScaleFactor>();
   if (supported_scale_factors->empty()) {
 #if !defined(OS_IOS)
     // On platforms other than iOS, 100P is always a supported scale factor.
     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());
       supported_scale_factors->push_back(SCALE_FACTOR_200P);
     } else {
       supported_scale_factors->push_back(SCALE_FACTOR_100P);
     }
 #elif defined(OS_MACOSX)
     if (base::mac::IsOSLionOrLater())
       supported_scale_factors->push_back(SCALE_FACTOR_200P);
@@ skipping 89 matching lines @@
   gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
   if (screen->IsDIPEnabled()) {
     gfx::Display display = screen->GetDisplayNearestWindow(view);
     return GetScaleFactorFromScale(display.device_scale_factor());
   }
   return ui::SCALE_FACTOR_100P;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui