Add scale factor and 2x resources from webkit and plumb through to ContentClient.

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"
@@ skipping 401 matching lines @@
 }
 
 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(
+    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);
+}
+
 #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))
     return false;
 
@@ skipping 66 matching lines @@
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
     content::PepperPluginInfo* plugin,
     bool* override_npapi_flash) {
   if (!ConductingPepperFlashFieldTrial())
     return false;
   return GetBundledPepperFlash(plugin, override_npapi_flash);
 }
 
 }  // namespace chrome