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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 | 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 #if defined(GOOGLE_CHROME_BUILD) |
| 156 registry->RegisterBooleanPref( |
| 157 prefs::kMediaRouterCloudServicesPrefSet, |
| 158 false, |
| 159 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 160 registry->RegisterBooleanPref( |
| 161 prefs::kMediaRouterEnableCloudServices, |
| 162 false, |
| 163 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 164 #endif // defined(GOOGLE_CHROME_BUILD) |
155 registry->RegisterBooleanPref( | 165 registry->RegisterBooleanPref( |
156 prefs::kMediaRouterFirstRunFlowAcknowledged, | 166 prefs::kMediaRouterFirstRunFlowAcknowledged, |
157 false, | 167 false, |
158 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 168 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
159 #endif | 169 #endif |
160 } | 170 } |
161 | 171 |
162 std::string Profile::GetDebugName() { | 172 std::string Profile::GetDebugName() { |
163 std::string name = GetPath().BaseName().MaybeAsASCII(); | 173 std::string name = GetPath().BaseName().MaybeAsASCII(); |
164 if (name.empty()) { | 174 if (name.empty()) { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 if (a->IsSameProfile(b)) | 229 if (a->IsSameProfile(b)) |
220 return false; | 230 return false; |
221 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 231 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
222 } | 232 } |
223 | 233 |
224 double Profile::GetDefaultZoomLevelForProfile() { | 234 double Profile::GetDefaultZoomLevelForProfile() { |
225 return GetDefaultStoragePartition(this) | 235 return GetDefaultStoragePartition(this) |
226 ->GetHostZoomMap() | 236 ->GetHostZoomMap() |
227 ->GetDefaultZoomLevel(); | 237 ->GetDefaultZoomLevel(); |
228 } | 238 } |
OLD | NEW |