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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); | 139 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); |
| 140 #endif | 140 #endif |
| 141 | 141 |
| 142 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); | 142 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); |
| 143 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); | 143 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); |
| 144 | 144 |
| 145 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) | 145 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
| 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 | |
| 150 #if defined(OS_ANDROID) | |
| 151 registry->RegisterBooleanPref( | |
|
anthonyvd
2015/12/15 14:43:22
nit: I think this fits on a single line.
Theresa
2015/12/15 18:10:36
Done.
| |
| 152 prefs::kClickedUpdateMenuItem, | |
| 153 false); | |
| 154 #endif | |
| 149 } | 155 } |
| 150 | 156 |
| 151 std::string Profile::GetDebugName() { | 157 std::string Profile::GetDebugName() { |
| 152 std::string name = GetPath().BaseName().MaybeAsASCII(); | 158 std::string name = GetPath().BaseName().MaybeAsASCII(); |
| 153 if (name.empty()) { | 159 if (name.empty()) { |
| 154 name = "UnknownProfile"; | 160 name = "UnknownProfile"; |
| 155 } | 161 } |
| 156 return name; | 162 return name; |
| 157 } | 163 } |
| 158 | 164 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 if (a->IsSameProfile(b)) | 214 if (a->IsSameProfile(b)) |
| 209 return false; | 215 return false; |
| 210 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 216 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 211 } | 217 } |
| 212 | 218 |
| 213 double Profile::GetDefaultZoomLevelForProfile() { | 219 double Profile::GetDefaultZoomLevelForProfile() { |
| 214 return GetDefaultStoragePartition(this) | 220 return GetDefaultStoragePartition(this) |
| 215 ->GetHostZoomMap() | 221 ->GetHostZoomMap() |
| 216 ->GetDefaultZoomLevel(); | 222 ->GetDefaultZoomLevel(); |
| 217 } | 223 } |
| OLD | NEW |