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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources); |
174 #endif | 174 #endif |
175 | 175 |
176 #if defined(OS_CHROMEOS) | 176 #if defined(OS_CHROMEOS) |
177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); | 177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); |
178 #endif | 178 #endif |
| 179 |
| 180 registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets); |
179 } | 181 } |
180 | 182 |
181 std::string Profile::GetDebugName() { | 183 std::string Profile::GetDebugName() { |
182 std::string name = GetPath().BaseName().MaybeAsASCII(); | 184 std::string name = GetPath().BaseName().MaybeAsASCII(); |
183 if (name.empty()) { | 185 if (name.empty()) { |
184 name = "UnknownProfile"; | 186 name = "UnknownProfile"; |
185 } | 187 } |
186 return name; | 188 return name; |
187 } | 189 } |
188 | 190 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 if (a->IsSameProfile(b)) | 241 if (a->IsSameProfile(b)) |
240 return false; | 242 return false; |
241 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 243 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
242 } | 244 } |
243 | 245 |
244 double Profile::GetDefaultZoomLevelForProfile() { | 246 double Profile::GetDefaultZoomLevelForProfile() { |
245 return GetDefaultStoragePartition(this) | 247 return GetDefaultStoragePartition(this) |
246 ->GetHostZoomMap() | 248 ->GetHostZoomMap() |
247 ->GetDefaultZoomLevel(); | 249 ->GetDefaultZoomLevel(); |
248 } | 250 } |
OLD | NEW |