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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_main.cc

Issue 5939002: Error handling added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: InitSharedResource() and ReloadSharedResource() return code is checked Created 10 years 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
« chrome/app/chrome_main.cc ('K') | « chrome/app/chrome_main.cc ('k') | chrome/browser/browser_main_mac.mm » ('j') | chrome/browser/browser_main_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 8958872415d194533730c89dfbe9c50dd47feab7..f44f3003f0721e872163e34cd85d5a8af553f5c3 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1150,8 +1150,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
#else
// On a POSIX OS other than ChromeOS, the parameter that is passed to the
// method InitSharedInstance is ignored.
- std::string app_locale = ResourceBundle::InitSharedInstance(
- local_state->GetString(prefs::kApplicationLocale));
+ std::string locale = local_state->GetString(prefs::kApplicationLocale);
+ std::string app_locale = ResourceBundle::InitSharedInstance(locale);
+ CHECK(app_locale == locale) << "Locale could not be found for " << locale;
Peter Kasting 2010/12/20 17:18:48 Nit: CHECK_EQ
glotov 2010/12/21 13:19:08 Done.
g_browser_process->SetApplicationLocale(app_locale);
FilePath resources_pack_path;
« chrome/app/chrome_main.cc ('K') | « chrome/app/chrome_main.cc ('k') | chrome/browser/browser_main_mac.mm » ('j') | chrome/browser/browser_main_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698