OLD | NEW |
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 "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); | 103 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); |
104 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, ""); | 104 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory, ""); |
105 #if defined(OS_CHROMEOS) | 105 #if defined(OS_CHROMEOS) |
106 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 106 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both |
107 // local state and user's profile. For other platforms we maintain | 107 // local state and user's profile. For other platforms we maintain |
108 // kApplicationLocale only in local state. | 108 // kApplicationLocale only in local state. |
109 // In the future we may want to maintain kApplicationLocale | 109 // In the future we may want to maintain kApplicationLocale |
110 // in user's profile for other platforms as well. | 110 // in user's profile for other platforms as well. |
111 prefs->RegisterStringPref(prefs::kApplicationLocale, ""); | 111 prefs->RegisterStringPref(prefs::kApplicationLocale, ""); |
112 prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, ""); | 112 prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, ""); |
| 113 prefs->RegisterStringPref(prefs::kApplicationLocaleOverride, ""); |
| 114 prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, ""); |
113 #endif | 115 #endif |
114 } | 116 } |
115 | 117 |
116 // static | 118 // static |
117 URLRequestContextGetter* Profile::GetDefaultRequestContext() { | 119 URLRequestContextGetter* Profile::GetDefaultRequestContext() { |
118 return default_request_context_; | 120 return default_request_context_; |
119 } | 121 } |
120 | 122 |
121 bool Profile::IsSyncAccessible() { | 123 bool Profile::IsSyncAccessible() { |
122 ProfileSyncService* syncService = GetProfileSyncService(); | 124 ProfileSyncService* syncService = GetProfileSyncService(); |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
672 | 674 |
673 // The file_system context for this profile. | 675 // The file_system context for this profile. |
674 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_; | 676 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_; |
675 | 677 |
676 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); | 678 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); |
677 }; | 679 }; |
678 | 680 |
679 Profile* Profile::CreateOffTheRecordProfile() { | 681 Profile* Profile::CreateOffTheRecordProfile() { |
680 return new OffTheRecordProfileImpl(this); | 682 return new OffTheRecordProfileImpl(this); |
681 } | 683 } |
OLD | NEW |