diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 01:05:49 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 01:05:49 +0000 |
| commit | ebe6922acb8adf9a88fc7f61e677e1231e0f0762 (patch) | |
| tree | 9fd91d795e6b755859e0143d912a206fdb0d4e03 /remoting | |
| parent | 0b620f4b8d4e0b4f0bb5d76a78b0aca431b9eb75 (diff) | |
| download | chromium_src-ebe6922acb8adf9a88fc7f61e677e1231e0f0762.zip chromium_src-ebe6922acb8adf9a88fc7f61e677e1231e0f0762.tar.gz chromium_src-ebe6922acb8adf9a88fc7f61e677e1231e0f0762.tar.bz2 | |
Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().
Both methods do almost the same and just difer on whether or not to load
the common resources (aka chrome pak files!).
BUG=340082
TEST=None
R=tony@chromium.org,lambroslambrou@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/457103003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/base/resources_linux.cc | 3 | ||||
| -rw-r--r-- | remoting/base/resources_mac.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/remoting/base/resources_linux.cc b/remoting/base/resources_linux.cc index d7d23ba..63a53f2 100644 --- a/remoting/base/resources_linux.cc +++ b/remoting/base/resources_linux.cc @@ -31,7 +31,8 @@ bool LoadResources(const std::string& pref_locale) { PathService::Override(ui::DIR_LOCALES, path.AppendASCII(kLocaleResourcesDirName)); - ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL); + ui::ResourceBundle::InitSharedInstanceWithLocale( + pref_locale, NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); } return true; diff --git a/remoting/base/resources_mac.cc b/remoting/base/resources_mac.cc index 7ea59b6..d848e67 100644 --- a/remoting/base/resources_mac.cc +++ b/remoting/base/resources_mac.cc @@ -32,7 +32,8 @@ bool LoadResources(const std::string& pref_locale) { if (pref_locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); - ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL); + ui::ResourceBundle::InitSharedInstanceWithLocale( + pref_locale, NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); } return true; |