Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 // Preferences related to the avatar bubble and user manager tutorials. | 146 // Preferences related to the avatar bubble and user manager tutorials. |
| 147 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0); | 147 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0); |
| 148 #endif | 148 #endif |
| 149 | 149 |
| 150 #if defined(OS_ANDROID) | 150 #if defined(OS_ANDROID) |
| 151 registry->RegisterBooleanPref(prefs::kClickedUpdateMenuItem, false); | 151 registry->RegisterBooleanPref(prefs::kClickedUpdateMenuItem, false); |
| 152 #endif | 152 #endif |
| 153 | 153 |
| 154 #if defined(ENABLE_MEDIA_ROUTER) | 154 #if defined(ENABLE_MEDIA_ROUTER) |
| 155 registry->RegisterBooleanPref( | 155 registry->RegisterBooleanPref( |
| 156 prefs::kMediaRouterCloudServicesPrefSet, | |
| 157 false, | |
| 158 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | |
| 159 registry->RegisterBooleanPref( | |
| 160 prefs::kMediaRouterEnableCloudServices, | |
| 161 false, | |
| 162 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | |
| 163 registry->RegisterBooleanPref( | |
|
anthonyvd
2016/01/21 15:52:33
Those seem to only be used when GOOGLE_CHROME_BUIL
apacible
2016/01/21 16:36:46
Fixed.
| |
| 156 prefs::kMediaRouterFirstRunFlowAcknowledged, | 164 prefs::kMediaRouterFirstRunFlowAcknowledged, |
| 157 false, | 165 false, |
| 158 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 166 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 159 #endif | 167 #endif |
| 160 } | 168 } |
| 161 | 169 |
| 162 std::string Profile::GetDebugName() { | 170 std::string Profile::GetDebugName() { |
| 163 std::string name = GetPath().BaseName().MaybeAsASCII(); | 171 std::string name = GetPath().BaseName().MaybeAsASCII(); |
| 164 if (name.empty()) { | 172 if (name.empty()) { |
| 165 name = "UnknownProfile"; | 173 name = "UnknownProfile"; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 if (a->IsSameProfile(b)) | 227 if (a->IsSameProfile(b)) |
| 220 return false; | 228 return false; |
| 221 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 229 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 222 } | 230 } |
| 223 | 231 |
| 224 double Profile::GetDefaultZoomLevelForProfile() { | 232 double Profile::GetDefaultZoomLevelForProfile() { |
| 225 return GetDefaultStoragePartition(this) | 233 return GetDefaultStoragePartition(this) |
| 226 ->GetHostZoomMap() | 234 ->GetHostZoomMap() |
| 227 ->GetDefaultZoomLevel(); | 235 ->GetDefaultZoomLevel(); |
| 228 } | 236 } |
| OLD | NEW |