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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 #if defined(OS_ANDROID) | 138 #if defined(OS_ANDROID) |
139 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); | 139 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); |
140 #endif | 140 #endif |
141 | 141 |
142 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); | 142 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); |
143 | 143 |
144 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) | 144 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
145 // Preferences related to the avatar bubble and user manager tutorials. | 145 // Preferences related to the avatar bubble and user manager tutorials. |
146 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0); | 146 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0); |
147 #endif | 147 #endif |
| 148 |
| 149 #if defined(OS_ANDROID) |
| 150 registry->RegisterBooleanPref( |
| 151 prefs::kClickedUpdateMenuItem, |
| 152 false); |
| 153 #endif |
148 } | 154 } |
149 | 155 |
150 std::string Profile::GetDebugName() { | 156 std::string Profile::GetDebugName() { |
151 std::string name = GetPath().BaseName().MaybeAsASCII(); | 157 std::string name = GetPath().BaseName().MaybeAsASCII(); |
152 if (name.empty()) { | 158 if (name.empty()) { |
153 name = "UnknownProfile"; | 159 name = "UnknownProfile"; |
154 } | 160 } |
155 return name; | 161 return name; |
156 } | 162 } |
157 | 163 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 if (a->IsSameProfile(b)) | 213 if (a->IsSameProfile(b)) |
208 return false; | 214 return false; |
209 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 215 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
210 } | 216 } |
211 | 217 |
212 double Profile::GetDefaultZoomLevelForProfile() { | 218 double Profile::GetDefaultZoomLevelForProfile() { |
213 return GetDefaultStoragePartition(this) | 219 return GetDefaultStoragePartition(this) |
214 ->GetHostZoomMap() | 220 ->GetHostZoomMap() |
215 ->GetDefaultZoomLevel(); | 221 ->GetDefaultZoomLevel(); |
216 } | 222 } |
OLD | NEW |