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

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

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 | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_mac.mm
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 8c46f78ab5208da3cf3e59700e1463aca7db7762..ecfd6026c3173dc983fc63080ff37c1e3e259d5c 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -203,7 +203,8 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
// TODO(markusheintz): Read preference pref::kApplicationLocale in order
// to enforce the application locale.
const std::string loaded_locale =
- ResourceBundle::InitSharedInstanceWithLocale(std::string(), NULL);
+ ui::ResourceBundle::InitSharedInstanceWithLocale(
+ std::string(), NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
CHECK(!loaded_locale.empty()) << "Default locale could not be found";
base::FilePath resources_pack_path;
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698