Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 6248017: Do not use local override for language settings: always sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tidy up Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); 105 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false);
106 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, ""); 106 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, "");
107 #if defined(OS_CHROMEOS) 107 #if defined(OS_CHROMEOS)
108 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both 108 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both
109 // local state and user's profile. For other platforms we maintain 109 // local state and user's profile. For other platforms we maintain
110 // kApplicationLocale only in local state. 110 // kApplicationLocale only in local state.
111 // In the future we may want to maintain kApplicationLocale 111 // In the future we may want to maintain kApplicationLocale
112 // in user's profile for other platforms as well. 112 // in user's profile for other platforms as well.
113 prefs->RegisterStringPref(prefs::kApplicationLocale, ""); 113 prefs->RegisterStringPref(prefs::kApplicationLocale, "");
114 prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, ""); 114 prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, "");
115 prefs->RegisterStringPref(prefs::kApplicationLocaleOverride, "");
116 prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, ""); 115 prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, "");
117 #endif 116 #endif
118 } 117 }
119 118
120 // static 119 // static
121 URLRequestContextGetter* Profile::GetDefaultRequestContext() { 120 URLRequestContextGetter* Profile::GetDefaultRequestContext() {
122 return default_request_context_; 121 return default_request_context_;
123 } 122 }
124 123
125 bool Profile::IsSyncAccessible() { 124 bool Profile::IsSyncAccessible() {
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 598
600 virtual policy::ProfilePolicyContext* GetPolicyContext() { 599 virtual policy::ProfilePolicyContext* GetPolicyContext() {
601 return NULL; 600 return NULL;
602 } 601 }
603 602
604 virtual PromoCounter* GetInstantPromoCounter() { 603 virtual PromoCounter* GetInstantPromoCounter() {
605 return NULL; 604 return NULL;
606 } 605 }
607 606
608 #if defined(OS_CHROMEOS) 607 #if defined(OS_CHROMEOS)
609 virtual void ChangeApplicationLocale( 608 virtual void ChangeApplicationLocale(const std::string& locale) {
610 const std::string& locale, bool keep_local) {
611 } 609 }
612 #endif // defined(OS_CHROMEOS) 610 #endif // defined(OS_CHROMEOS)
613 611
614 virtual PrefProxyConfigTracker* GetProxyConfigTracker() { 612 virtual PrefProxyConfigTracker* GetProxyConfigTracker() {
615 return profile_->GetProxyConfigTracker(); 613 return profile_->GetProxyConfigTracker();
616 } 614 }
617 615
618 virtual PrerenderManager* GetPrerenderManager() { 616 virtual PrerenderManager* GetPrerenderManager() {
619 // We do not allow prerendering in OTR profiles at this point. 617 // We do not allow prerendering in OTR profiles at this point.
620 // TODO(tburkard): Figure out if we want to support this, and how, at some 618 // TODO(tburkard): Figure out if we want to support this, and how, at some
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 680
683 // The file_system context for this profile. 681 // The file_system context for this profile.
684 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_; 682 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
685 683
686 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 684 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
687 }; 685 };
688 686
689 Profile* Profile::CreateOffTheRecordProfile() { 687 Profile* Profile::CreateOffTheRecordProfile() {
690 return new OffTheRecordProfileImpl(this); 688 return new OffTheRecordProfileImpl(this);
691 } 689 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698