Chromium Code Reviews| 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..4b8c60344d81f183fec88d8f5749d151eb74f6fd 100644 |
| --- a/ui/base/resource/resource_bundle.h |
| +++ b/ui/base/resource/resource_bundle.h |
| @@ -115,6 +115,13 @@ class UI_BASE_EXPORT ResourceBundle { |
| 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
tfarina
2014/08/07 17:12:33
Nope.
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
|
| + |
| // 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 +132,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 +312,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, |