Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(588)

Unified Diff: remoting/base/resources_mac.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/resources_linux.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/resources_mac.cc
diff --git a/remoting/base/resources_mac.cc b/remoting/base/resources_mac.cc
index 7ea59b6a8a070ed84b9d9d3833da7d0ab0b5d0b3..d848e67c04190d2ee51fe92ce77b906d0b159c8e 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;
« no previous file with comments | « remoting/base/resources_linux.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698