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 106 matching lines @@
   // 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);

[oshima, 2014/07/29 08:24:41]

Is anyone using this delegate?

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

Yes, the delegate is used by CEF.  We should add a comment to the class to make
this clear.

[oshima, 2014/07/29 16:43:39]

Oh I see. I asked because all instances hit by cs passed NULL.
This should be a Init parameter as well.

 
   // 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 given file. The second argument
-  // controls whether or not ResourceBundle::LoadCommonResources is called.
-  // This allows the use of this function in a sandbox without local file
-  // access (as on Android).
-  static void InitSharedInstanceWithPakFile(base::File file,
-                                            bool should_load_common_resources);
+  // Initialize the ResourceBundle using given file. This allows the use of this
+  // function in a sandbox without local file access (as on Android).

[oshima, 2014/07/29 08:24:41]

I think we should ifdef for android as that's the only platform. 

+  static void InitSharedInstanceWithPakFile(base::File file);
 
   // Initialize the ResourceBundle using given data pack path for testing.
   static void InitSharedInstanceWithPakPath(const base::FilePath& path);

[oshima, 2014/07/29 08:24:41]

This should retire.

 
   // Delete the ResourceBundle for this process if it exists.
   static void CleanupSharedInstance();
 
   // Returns true after the global resource loader instance has been created.
   static bool HasSharedInstance();
 
   // Return the global resource loader instance.
   static ResourceBundle& GetSharedInstance();
 
@@ skipping 133 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_