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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
107 registry->RegisterDictionaryPref( | 107 registry->RegisterDictionaryPref( |
108 prefs::kSafeBrowsingIncidentsSent, | 108 prefs::kSafeBrowsingIncidentsSent, |
109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
110 #if defined(ENABLE_GOOGLE_NOW) | 110 #if defined(ENABLE_GOOGLE_NOW) |
111 registry->RegisterBooleanPref( | 111 registry->RegisterBooleanPref( |
112 prefs::kGoogleGeolocationAccessEnabled, | 112 prefs::kGoogleGeolocationAccessEnabled, |
113 false, | 113 false, |
114 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 114 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
115 #endif | 115 #endif |
| 116 // This pref is intentionally outside the above #if. |
| 117 // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827 |
| 118 registry->RegisterBooleanPref( |
| 119 prefs::kGoogleNowLauncherEnabled, |
| 120 true, |
| 121 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
116 registry->RegisterBooleanPref( | 122 registry->RegisterBooleanPref( |
117 prefs::kDisableExtensions, | 123 prefs::kDisableExtensions, |
118 false, | 124 false, |
119 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 125 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
120 #if defined(ENABLE_EXTENSIONS) | 126 #if defined(ENABLE_EXTENSIONS) |
121 registry->RegisterBooleanPref( | 127 registry->RegisterBooleanPref( |
122 extensions::pref_names::kAlertsInitialized, | 128 extensions::pref_names::kAlertsInitialized, |
123 false, | 129 false, |
124 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 130 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
125 #endif | 131 #endif |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 if (a->IsSameProfile(b)) | 262 if (a->IsSameProfile(b)) |
257 return false; | 263 return false; |
258 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 264 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
259 } | 265 } |
260 | 266 |
261 double Profile::GetDefaultZoomLevelForProfile() { | 267 double Profile::GetDefaultZoomLevelForProfile() { |
262 return GetDefaultStoragePartition(this) | 268 return GetDefaultStoragePartition(this) |
263 ->GetHostZoomMap() | 269 ->GetHostZoomMap() |
264 ->GetDefaultZoomLevel(); | 270 ->GetDefaultZoomLevel(); |
265 } | 271 } |
OLD | NEW |