Error handling added

chrome/browser/browser_main_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_main_posix.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/app_switches.h"
 #include "app/l10n_util_mac.h"
@@ skipping 85 matching lines @@
     if (!parameters().ui_task) {
       // The browser process only wants to support the language Cocoa will use,
       // so force the app locale to be overriden with that value.
       l10n_util::OverrideLocaleWithCocoaLocale();
 
       // 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);
+      std::string locale = ResourceBundle::InitSharedInstance(pref_locale);

[Peter Kasting, 2010/12/21 18:35:58]

Is this going to do the right thing?  We've never set |pref_locale|.  It seems
like we should, like we do on other platforms?

[glotov, 2010/12/21 20:33:34]

Yes, looks confusing, I rewrote it.
As I mentioned above, InitSharedInstance() will choose the default locale then.

+      CHECK(!locale.empty()) << "Locale could not be found for " << pref_locale;

[Peter Kasting, 2010/12/21 18:35:58]

Nit: Same nit

[glotov, 2010/12/21 20:33:34]

Done.

 
       FilePath resources_pack_path;
       PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
       ResourceBundle::AddDataPackToSharedInstance(resources_pack_path);
     }
 
     // Now load the nib (from the right bundle).
     scoped_nsobject<NSNib>
         nib([[NSNib alloc] initWithNibNamed:@"MainMenu"
                                      bundle:mac_util::MainAppBundle()]);
@@ skipping 25 matching lines @@
       base::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsMac(parameters);
 }