summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main_mac.mm
diff options
context:
space:
mode:
authorglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-22 16:05:57 +0000
committerglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-22 16:05:57 +0000
commit455ee19d2e3d8c78dfa38967bb484f276a812647 (patch)
tree3b7deaabc03d784ed5d70f92305375731da4557d /chrome/browser/browser_main_mac.mm
parent95bf8a5bab5b636d63862a83b6930a414d1bad0b (diff)
downloadchromium_src-455ee19d2e3d8c78dfa38967bb484f276a812647.zip
chromium_src-455ee19d2e3d8c78dfa38967bb484f276a812647.tar.gz
chromium_src-455ee19d2e3d8c78dfa38967bb484f276a812647.tar.bz2
Error handling added
BUG=chromium-os:10033 TEST=none Review URL: http://codereview.chromium.org/5939002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_mac.mm')
-rw-r--r--chrome/browser/browser_main_mac.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index 98629ba..619be2d 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -99,10 +99,11 @@ class BrowserMainPartsMac : public BrowserMainPartsPosix {
// Before we load the nib, we need to start up the resource bundle so we
// have the strings avaiable for localization.
- std::string pref_locale;
// TODO(markusheintz): Read preference pref::kApplicationLocale in order
// to enforce the application locale.
- ResourceBundle::InitSharedInstance(pref_locale);
+ const std::string loaded_locale =
+ ResourceBundle::InitSharedInstance(std::string());
+ CHECK(!loaded_locale.empty()) << "Default locale could not be found";
FilePath resources_pack_path;
PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);