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) {
+void ResourceBundle::AddDataPack(const FilePath& path, float scale_factor) {
   scoped_ptr<DataPack> data_pack(new DataPack());
   if (data_pack->Load(path)) {
+    data_pack->set_scale_factor(scale_factor);
     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
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
@@ skipping 298 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