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 "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 false, | 163 false, |
164 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 164 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
165 registry->RegisterBooleanPref( | 165 registry->RegisterBooleanPref( |
166 prefs::kMediaRouterEnableCloudServices, | 166 prefs::kMediaRouterEnableCloudServices, |
167 false, | 167 false, |
168 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 168 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
169 registry->RegisterBooleanPref( | 169 registry->RegisterBooleanPref( |
170 prefs::kMediaRouterFirstRunFlowAcknowledged, | 170 prefs::kMediaRouterFirstRunFlowAcknowledged, |
171 false, | 171 false, |
172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 173 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources); |
173 #endif | 174 #endif |
174 | 175 |
175 #if defined(OS_CHROMEOS) | 176 #if defined(OS_CHROMEOS) |
176 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); | 177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); |
177 #endif | 178 #endif |
178 } | 179 } |
179 | 180 |
180 std::string Profile::GetDebugName() { | 181 std::string Profile::GetDebugName() { |
181 std::string name = GetPath().BaseName().MaybeAsASCII(); | 182 std::string name = GetPath().BaseName().MaybeAsASCII(); |
182 if (name.empty()) { | 183 if (name.empty()) { |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 if (a->IsSameProfile(b)) | 239 if (a->IsSameProfile(b)) |
239 return false; | 240 return false; |
240 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 241 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
241 } | 242 } |
242 | 243 |
243 double Profile::GetDefaultZoomLevelForProfile() { | 244 double Profile::GetDefaultZoomLevelForProfile() { |
244 return GetDefaultStoragePartition(this) | 245 return GetDefaultStoragePartition(this) |
245 ->GetHostZoomMap() | 246 ->GetHostZoomMap() |
246 ->GetDefaultZoomLevel(); | 247 ->GetDefaultZoomLevel(); |
247 } | 248 } |
OLD | NEW |