| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 prefs->RegisterStringPref(prefs::kApplicationLocale, | 181 prefs->RegisterStringPref(prefs::kApplicationLocale, |
| 182 "", | 182 "", |
| 183 PrefService::SYNCABLE_PREF); | 183 PrefService::SYNCABLE_PREF); |
| 184 prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, | 184 prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, |
| 185 "", | 185 "", |
| 186 PrefService::UNSYNCABLE_PREF); | 186 PrefService::UNSYNCABLE_PREF); |
| 187 prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, | 187 prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, |
| 188 "", | 188 "", |
| 189 PrefService::UNSYNCABLE_PREF); | 189 PrefService::UNSYNCABLE_PREF); |
| 190 #endif | 190 #endif |
| 191 |
| 192 prefs->RegisterBooleanPref(prefs::kSyncPromoExpanded, |
| 193 true, |
| 194 PrefService::UNSYNCABLE_PREF); |
| 191 } | 195 } |
| 192 | 196 |
| 193 // static | 197 // static |
| 194 net::URLRequestContextGetter* Profile::GetDefaultRequestContext() { | 198 net::URLRequestContextGetter* Profile::GetDefaultRequestContext() { |
| 195 return default_request_context_; | 199 return default_request_context_; |
| 196 } | 200 } |
| 197 | 201 |
| 198 std::string Profile::GetDebugName() { | 202 std::string Profile::GetDebugName() { |
| 199 std::string name = GetPath().BaseName().MaybeAsASCII(); | 203 std::string name = GetPath().BaseName().MaybeAsASCII(); |
| 200 if (name.empty()) { | 204 if (name.empty()) { |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 }; | 865 }; |
| 862 #endif | 866 #endif |
| 863 | 867 |
| 864 Profile* Profile::CreateOffTheRecordProfile() { | 868 Profile* Profile::CreateOffTheRecordProfile() { |
| 865 #if defined(OS_CHROMEOS) | 869 #if defined(OS_CHROMEOS) |
| 866 if (Profile::IsGuestSession()) | 870 if (Profile::IsGuestSession()) |
| 867 return new GuestSessionProfile(this); | 871 return new GuestSessionProfile(this); |
| 868 #endif | 872 #endif |
| 869 return new OffTheRecordProfileImpl(this); | 873 return new OffTheRecordProfileImpl(this); |
| 870 } | 874 } |
| OLD | NEW |