ui: Remove ResourceBundle::LoadCommonResources().

ui/base/resource/resource_bundle.h

 // 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.
 
 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 97 matching lines @@
     // false to attempt retrieval of the default string.
     virtual bool GetLocalizedString(int message_id, base::string16* value) = 0;
 
     // Returns a font or NULL to attempt retrieval of the default resource.
     virtual scoped_ptr<gfx::Font> GetFont(FontStyle style) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
+  struct InitParams {
+    base::FilePath main_pak_path;
+    base::FilePath scaled_pak_path;

[oshima, 2014/08/07 17:01:10]

There can be two pak files for scaled images.

Are you going to use the pattern like scaled_pak_path + "_100_percent.pak",
scaled_pak_path + "_200_percent.pak"?

or have separate fields for 1x and 2x?

[tfarina, 2014/08/07 17:12:33]

Nope.
 
Right.

I will change it to:

base::FilePath scaled_1x_pak_path;
base::FilePath scaled_2x_pak_path;

I think that is clearer.

[tfarina, 2014/08/09 16:22:42]

Done.

+    std::string pref_locale;
+    Delegate* delegate;
+  };

[tony, 2014/08/07 16:29:34]

In the future when might need to do something more complicated to differentiate
different scale factors, but this seems OK for now.

+
   // Initialize the ResourceBundle for this process. Does not take ownership of
   // the |delegate| value. Returns the language selected.
   // NOTE: Mac ignores this and always loads up resources for the language
   // defined by the Cocoa UI (i.e., NSBundle does the language work).
   //
   // TODO(sergeyu): This method also loads common resources (i.e. chrome.pak).
   // There is no way to specify which resource files are loaded, i.e. names of
   // the files are hardcoded in ResourceBundle. Fix it to allow to specify which
   // files are loaded (e.g. add a new method in Delegate).
   static std::string InitSharedInstanceWithLocale(
-      const std::string& pref_locale, Delegate* delegate);
+      const std::string& pref_locale,
+      Delegate* delegate);
 
   // Same as InitSharedInstanceWithLocale(), but loads only localized resources,
   // without default resource packs.
   static std::string InitSharedInstanceLocaleOnly(
-      const std::string& pref_locale, Delegate* delegate);
+      const std::string& pref_locale,
+      Delegate* delegate);
 
   // Initialize the ResourceBundle using the given file region. If |region| is
   // MemoryMappedFile::Region::kWholeFile, the entire |pak_file| is used.
   // |should_load_common_resources| controls whether or not LoadCommonResources
   // is called.
   // This allows the use of this function in a sandbox without local file
   // access (as on Android).
   static void InitSharedInstanceWithPakFileRegion(
       base::File pak_file,
       const base::MemoryMappedFile::Region& region,
@@ skipping 152 matching lines @@
   // Ctor/dtor are private, since we're a singleton.
   explicit ResourceBundle(Delegate* delegate);
   ~ResourceBundle();
 
   // Shared initialization.
   static void InitSharedInstance(Delegate* delegate);
 
   // Free skia_images_.
   void FreeImages();
 
-  // Load the main resources.
-  void LoadCommonResources();
-
   // Implementation for AddDataPackFromPath and AddOptionalDataPackFromPath, if
   // the pack is not |optional| logs an error on failure to load.
   void AddDataPackFromPathInternal(const base::FilePath& path,
                                    ScaleFactor scale_factor,
                                    bool optional);
 
   // Inserts |data_pack| to |data_pack_| and updates |max_scale_factor_|
   // accordingly.
   void AddDataPack(DataPack* data_pack);
 
@@ skipping 102 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 }  // namespace ui
 
 // TODO(beng): Someday, maybe, get rid of this.
 using ui::ResourceBundle;
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_