Do not use local override for language settings: always sync.

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 94 matching lines @@
   prefs->RegisterBooleanPref(prefs::kDisableExtensions, false);
   prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, "");
 #if defined(OS_CHROMEOS)
   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both
   // local state and user's profile.  For other platforms we maintain
   // kApplicationLocale only in local state.
   // In the future we may want to maintain kApplicationLocale
   // in user's profile for other platforms as well.
   prefs->RegisterStringPref(prefs::kApplicationLocale, "");
   prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, "");
-  prefs->RegisterStringPref(prefs::kApplicationLocaleOverride, "");
   prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, "");
 #endif
 }
 
 // static
 URLRequestContextGetter* Profile::GetDefaultRequestContext() {
   return default_request_context_;
 }
 
 bool Profile::IsSyncAccessible() {
@@ skipping 473 matching lines @@
 
   virtual policy::ProfilePolicyContext* GetPolicyContext() {
     return NULL;
   }
 
   virtual PromoCounter* GetInstantPromoCounter() {
     return NULL;
   }
 
 #if defined(OS_CHROMEOS)
-  virtual void ChangeApplicationLocale(
-      const std::string& locale, bool keep_local) {
+  virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) {
   }
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() {
     return profile_->GetProxyConfigTracker();
   }
 
   virtual PrerenderManager* GetPrerenderManager() {
     // We do not allow prerendering in OTR profiles at this point.
     // TODO(tburkard): Figure out if we want to support this, and how, at some
@@ skipping 61 matching lines @@
 
   // The file_system context for this profile.
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 Profile* Profile::CreateOffTheRecordProfile() {
   return new OffTheRecordProfileImpl(this);
 }