Index: ui/base/resource/resource_bundle.h |
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h |
index b0e9cdb1738bf4fa6df2c116e1929eb90eff3ad4..492849c9e7d8d9d169ecc844b1c7ff4cf45e43aa 100644 |
--- a/ui/base/resource/resource_bundle.h |
+++ b/ui/base/resource/resource_bundle.h |
@@ -115,6 +115,17 @@ class UI_BASE_EXPORT ResourceBundle { |
virtual ~Delegate() {} |
}; |
+ struct UI_BASE_EXPORT InitParams { |
+ InitParams(); |
+ ~InitParams(); |
+ |
+ base::FilePath main_pak_path; |
+ base::FilePath scaled_1x_pak_path; |
+ base::FilePath scaled_2x_pak_path; |
+ std::string pref_locale; |
+ Delegate* delegate; |
+ }; |
+ |
// 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 |
@@ -125,12 +136,14 @@ 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); |
// 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. |
@@ -303,9 +316,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, |