Add scale factor tag to data packs

ui/base/resource/resource_bundle.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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 71 matching lines @@
   // Must call InitSharedInstance before this function.
   CHECK(g_shared_instance_ != NULL);
   return *g_shared_instance_;
 }
 
 // static
 bool ResourceBundle::LocaleDataPakExists(const std::string& locale) {
   return !GetLocaleFilePath(locale).empty();
 }
 
-void ResourceBundle::AddDataPack(const FilePath& path) {
-  scoped_ptr<DataPack> data_pack(new DataPack());
+void ResourceBundle::AddDataPack(const FilePath& path, float scale_factor) {
+  scoped_ptr<DataPack> data_pack(new DataPack(ResourceHandle::kScaleFactor1x));
   if (data_pack->Load(path)) {
     data_packs_.push_back(data_pack.release());
   } else {
     LOG(ERROR) << "Failed to load " << path.value()
                << "\nSome features may not be available.";
   }
 }
 
 #if !defined(OS_MACOSX)
 // static
@@ skipping 30 matching lines @@
       locale_file_path = GetLocaleFilePath(app_locale);
     }
   }
 
   if (locale_file_path.empty()) {
     // It's possible that there is no locale.pak.
     NOTREACHED();
     return std::string();
   }
 
-  scoped_ptr<DataPack> data_pack(new DataPack());
+  scoped_ptr<DataPack> data_pack(new DataPack(ResourceHandle::kScaleFactor1x));
   if (!data_pack->Load(locale_file_path)) {
     UMA_HISTOGRAM_ENUMERATION("ResourceBundle.LoadLocaleResourcesError",
                               logging::GetLastSystemErrorCode(), 16000);
     NOTREACHED() << "failed to load locale.pak";
     return std::string();
   }
 
   locale_resources_data_.reset(data_pack.release());
   return app_locale;
 }
 
 void ResourceBundle::LoadTestResources(const FilePath& path) {
   // Use the given resource pak for both common and localized resources.
-  scoped_ptr<DataPack> data_pack(new DataPack());
+  scoped_ptr<DataPack> data_pack(new DataPack(ResourceHandle::kScaleFactor1x));
   if (data_pack->Load(path))
     data_packs_.push_back(data_pack.release());
 
-  data_pack.reset(new DataPack());
+  data_pack.reset(new DataPack(ResourceHandle::kScaleFactor1x));
   if (data_pack->Load(path))
     locale_resources_data_.reset(data_pack.release());
 }
 
 void ResourceBundle::UnloadLocaleResources() {
   locale_resources_data_.reset();
 }
 
 string16 ResourceBundle::GetLocalizedString(int message_id) {
   // Ensure that ReloadLocaleResources() doesn't drop the resources while
@@ skipping 230 matching lines @@
     SkBitmap* bitmap = new SkBitmap();
     bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
     bitmap->allocPixels();
     bitmap->eraseARGB(255, 255, 0, 0);
     empty_image = new gfx::Image(bitmap);
   }
   return empty_image;
 }
 
 }  // namespace ui