Index: ui/base/resource/resource_bundle.h |
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h |
index 1f40728ac25f1717f748a65e4fd7625b802504c2..19fd3b8828488d5896e469329228b360170bffd9 100644 |
--- a/ui/base/resource/resource_bundle.h |
+++ b/ui/base/resource/resource_bundle.h |
@@ -124,19 +124,18 @@ class UI_BASE_EXPORT ResourceBundle { |
// 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
oshima
2014/07/29 16:43:39
Oh I see. I asked because all instances hit by cs
|
// 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
|
+ 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.
|
@@ -293,9 +292,6 @@ class UI_BASE_EXPORT ResourceBundle { |
// 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, |