Error handling added

chrome/app/chrome_main.cc

 // 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 "app/app_paths.h"
 #include "app/app_switches.h"
 #include "app/resource_bundle.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 828 matching lines @@
   if (SubprocessNeedsResourceBundle(process_type)) {
     // Initialize ResourceBundle which handles files loaded from external
     // sources.  The language should have been passed in to us from the
     // browser process as a command line flag.
     DCHECK(command_line.HasSwitch(switches::kLang) ||
            process_type == switches::kZygoteProcess);
 
     // TODO(markusheintz): The command line flag --lang is actually processed
     // by the CommandLinePrefStore, and made available through the PrefService
     // via the preference prefs::kApplicationLocale. The browser process uses
-    // the --lang flag to passe the value of the PrefService in here. Maybe this
+    // the --lang flag to pass the value of the PrefService in here. Maybe this
     // value could be passed in a different way.
-    ResourceBundle::InitSharedInstance(
-        command_line.GetSwitchValueASCII(switches::kLang));
+    std::string locale = command_line.GetSwitchValueASCII(switches::kLang);
+    const std::string res = ResourceBundle::InitSharedInstance(locale);

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

Nit: |res| is a poor name; consider |loaded_locale|.

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

Agree, just wanted a short name to fit the line. Moreover it is very local. But
since you noticed... Done.

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

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

Nit: Shouldn't we be checking that these are equal?

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

That was my mistake that time. No, we shouldn't. Because usually |locale| is
empty, but InitSharedInstance("") will load the default locale then (and return
its name).

 
 #if defined(OS_MACOSX)
     // Update the process name (need resources to get the strings, so
     // only do this when ResourcesBundle has been initialized).
     SetMacProcessName(process_type);
 #endif  // defined(OS_MACOSX)
   }
 
   if (!process_type.empty())
     CommonSubprocessInit();
@@ skipping 41 matching lines @@
 
   int exit_code = RunNamedProcessTypeMain(process_type, main_params);
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   LowLevelShutdown();
 
   return exit_code;
 }