Mac language/locale cleanup...

chrome/browser/browser_main_mac.mm

 // Copyright (c) 2008 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.h"
 
 #import <Cocoa/Cocoa.h>
 
+#include "app/app_switches.h"
+#include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "chrome/app/breakpad_mac.h"
 #import "chrome/app/keystone_glue.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_main_win.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/main_function_params.h"
@@ skipping 13 matching lines @@
   [BrowserCrApplication sharedApplication];
 
   // Before we load the nib, we need to start up the resource bundle so we have
   // the strings avaiable for localization.
   if (!parameters.ui_task) {
     ResourceBundle::InitSharedInstance(std::wstring());
   }
   // Now load the nib.
   [NSBundle loadNibNamed:@"MainMenu" owner:NSApp];
 
+  // 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();
+
   // This is a no-op if the KeystoneRegistration framework is not present.
   // The framework is only distributed with branded Google Chrome builds.
   [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone];
 }
 
 void DidEndMainMessageLoop() {
   AppController* appController = [NSApp delegate];
   [appController didEndMainMessageLoop];
 }
 
@@ skipping 21 matching lines @@
 int HandleIconsCommands(const CommandLine& parsed_command_line) {
   return 0;
 }
 
 bool CheckMachineLevelInstall() {
   return false;
 }
 
 void PrepareRestartOnCrashEnviroment(const CommandLine& parsed_command_line) {
 }