Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

chrome/common/chrome_content_client.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 "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pepper_flash.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "content/public/common/url_constants.h"
 #include "grit/common_resources.h"
 #include "remoting/client/plugin/pepper_entrypoints.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/plugin_constants.h"
 
 #include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
@@ skipping 372 matching lines @@
   chrome::VersionInfo version_info;
   std::string product("Chrome/");
   product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
   return webkit_glue::BuildUserAgentFromProduct(product);
 }
 
 string16 ChromeContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
-base::StringPiece ChromeContentClient::GetDataResource(int resource_id) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
-}
-
-base::StringPiece ChromeContentClient::GetImageResource(
+base::StringPiece ChromeContentClient::GetDataResource(
     int resource_id,
-    float scale_factor) const {
-  // TODO(flackr): Pass scale_factor to ResourceBundle to get best matching
-  // image resource for the given scale factor.
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+    ui::ScaleFactor scale_factor) const {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      resource_id, scale_factor);
 }
 
 #if defined(OS_WIN)
 bool ChromeContentClient::SandboxPlugin(CommandLine* command_line,
                                         sandbox::TargetPolicy* policy) {
   std::wstring plugin_dll = command_line->
       GetSwitchValueNative(switches::kPluginPath);
 
   FilePath builtin_flash;
   if (!PathService::Get(chrome::FILE_FLASH_PLUGIN, &builtin_flash))
@@ skipping 68 matching lines @@
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
     content::PepperPluginInfo* plugin,
     bool* override_npapi_flash) {
   if (!ConductingPepperFlashFieldTrial())
     return false;
   return GetBundledPepperFlash(plugin, override_npapi_flash);
 }
 
 }  // namespace chrome