Load the resources for max scale factor first.

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 11 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include <Windows.h>
 #endif  // defined(OS_WIN)
 
 #if defined(OS_CHROMEOS)
 #include "ui/base/resource/resource_bundle.h"
 #endif
 
+#include "base/debug/stack_trace.h"

[sky, 2012/11/09 23:02:17]

remove this

[oshima, 2012/11/09 23:49:37]

Done.

+
 namespace ui {
 
 namespace {
 
 bool ScaleFactorComparator(const ScaleFactor& lhs, const ScaleFactor& rhs){
   return GetScaleFactorScale(lhs) < GetScaleFactorScale(rhs);
 }
 
 #if defined(OS_WIN)
 // Helper function that determines whether we want to optimize the UI for touch.
@@ skipping 15 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.4f, 1.8f, 2.0f};
+const float kScaleFactorScales[] = {1.0f, 1.0f, 1.4f, 1.8f, 2.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)
     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);
 #elif defined(OS_WIN) && defined(ENABLE_HIDPI)
     if (base::win::IsMetroProcess() && base::win::IsTouchEnabled()) {
       supported_scale_factors->push_back(SCALE_FACTOR_140P);
       supported_scale_factors->push_back(SCALE_FACTOR_180P);
     }
-#elif defined(USE_ASH)
+#elif defined(OS_CHROMEOS)
+    // TODO(oshima): Include 200P only if the device support 200P
     supported_scale_factors->push_back(SCALE_FACTOR_200P);
 #endif
     std::sort(supported_scale_factors->begin(),
               supported_scale_factors->end(),
               ScaleFactorComparator);
   }
   return *supported_scale_factors;
 }
 
 }  // namespace
@@ skipping 19 matching lines @@
   const std::vector<ScaleFactor>& supported =
       GetSupportedScaleFactorsInternal();
   for (size_t i = 0; i < supported.size(); ++i) {
     ScaleFactor scale_factor = supported[i];
     float diff = std::abs(kScaleFactorScales[scale_factor] - scale);
     if (diff < smallest_diff) {
       closest_match = scale_factor;
       smallest_diff = diff;
     }
   }
+  DCHECK_NE(closest_match, SCALE_FACTOR_NONE);
   return closest_match;
 }
 
 float GetScaleFactorScale(ScaleFactor scale_factor) {
   return kScaleFactorScales[scale_factor];
 }
 
 ScaleFactor GetMaxScaleFactor() {
 #if defined(OS_CHROMEOS)
   return ResourceBundle::GetSharedInstance().max_scale_factor();
@@ skipping 32 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