Remove --default-device-scale-factor

ui/base/resource/resource_bundle_aurax11.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/resource/resource_bundle.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_handle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 FilePath GetResourcesPakFilePath(const std::string& pak_name) {
   FilePath path;
   if (PathService::Get(base::DIR_MODULE, &path))
     return path.AppendASCII(pak_name.c_str());
 
   // Return just the name of the pack file.
   return FilePath(pak_name.c_str());
 }
 
 bool ShouldLoad2xResources() {
-  return (gfx::Display::GetDefaultDeviceScaleFactor() > 1.0f ||
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources));
+  return gfx::Display::GetForcedDeviceScaleFactor() > 1.0f ||
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources);
 }
 
 }  // namespace
 
 namespace ui {
 
 void ResourceBundle::LoadCommonResources() {
   // Always load the 1x data pack first as the 2x data pack contains both 1x and
   // 2x images. The 1x data pack only has 1x images, thus passes in an accurate
   // scale factor to gfx::ImageSkia::AddBitmapForScale.
-  // TODO(pkotwicz): Fix this in cases where it is intended for the 2x bitmap
-  // not to be 2 * size of the 1x bitmap for HDA.
-  // TODO(oshima): Fix this where it is unintended.
 
   AddDataPack(GetResourcesPakFilePath("chrome.pak"),
               SCALE_FACTOR_100P);
 
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     // 1x touch
     AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
                 SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
                 SCALE_FACTOR_100P);
@@ skipping 20 matching lines @@
   }
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped image is not used on ChromeOS.
   DCHECK_EQ(rtl, RTL_DISABLED);
   return GetImageNamed(resource_id);
 }
 
 }  // namespace ui