| 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" |
| 11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 12 #include "chrome/browser/first_run/first_run.h" | 12 #include "chrome/browser/first_run/first_run.h" |
| 13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "chrome/browser/sync/profile_sync_service.h" | 14 #include "chrome/browser/sync/profile_sync_service.h" |
| 15 #include "chrome/browser/sync/profile_sync_service_factory.h" | 15 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 16 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 17 #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h" | 17 #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h" |
| 18 #include "components/pref_registry/pref_registry_syncable.h" | 18 #include "components/pref_registry/pref_registry_syncable.h" |
| 19 #include "components/sync_driver/sync_prefs.h" | 19 #include "components/sync_driver/sync_prefs.h" |
| 20 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
| 21 #include "content/public/browser/notification_source.h" | 21 #include "content/public/browser/notification_source.h" |
| 22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "content/public/browser/web_ui.h" | 23 #include "content/public/browser/web_ui.h" |
| 24 #include "extensions/browser/pref_names.h" | |
| 25 | 24 |
| 26 #if defined(OS_CHROMEOS) | 25 #if defined(OS_CHROMEOS) |
| 27 #include "base/command_line.h" | 26 #include "base/command_line.h" |
| 28 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
| 29 #include "chromeos/chromeos_switches.h" | 28 #include "chromeos/chromeos_switches.h" |
| 30 #endif | 29 #endif |
| 31 | 30 |
| 32 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING) | 31 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING) |
| 33 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 32 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 34 #endif | 33 #endif |
| 35 | 34 |
| 35 #if defined(ENABLE_EXTENSIONS) |
| 36 #include "extensions/browser/pref_names.h" |
| 37 #endif |
| 38 |
| 36 Profile::Profile() | 39 Profile::Profile() |
| 37 : restored_last_session_(false), | 40 : restored_last_session_(false), |
| 38 sent_destroyed_notification_(false), | 41 sent_destroyed_notification_(false), |
| 39 accessibility_pause_level_(0) { | 42 accessibility_pause_level_(0) { |
| 40 } | 43 } |
| 41 | 44 |
| 42 Profile::~Profile() { | 45 Profile::~Profile() { |
| 43 } | 46 } |
| 44 | 47 |
| 45 // static | 48 // static |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 #if defined(ENABLE_GOOGLE_NOW) | 127 #if defined(ENABLE_GOOGLE_NOW) |
| 125 registry->RegisterBooleanPref( | 128 registry->RegisterBooleanPref( |
| 126 prefs::kGoogleGeolocationAccessEnabled, | 129 prefs::kGoogleGeolocationAccessEnabled, |
| 127 false, | 130 false, |
| 128 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 131 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 129 #endif | 132 #endif |
| 130 registry->RegisterBooleanPref( | 133 registry->RegisterBooleanPref( |
| 131 prefs::kDisableExtensions, | 134 prefs::kDisableExtensions, |
| 132 false, | 135 false, |
| 133 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 136 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 137 #if defined(ENABLE_EXTENSIONS) |
| 134 registry->RegisterBooleanPref( | 138 registry->RegisterBooleanPref( |
| 135 extensions::pref_names::kAlertsInitialized, | 139 extensions::pref_names::kAlertsInitialized, |
| 136 false, | 140 false, |
| 137 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 141 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 142 #endif |
| 138 registry->RegisterStringPref( | 143 registry->RegisterStringPref( |
| 139 prefs::kSelectFileLastDirectory, | 144 prefs::kSelectFileLastDirectory, |
| 140 std::string(), | 145 std::string(), |
| 141 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 146 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 142 registry->RegisterDoublePref( | 147 registry->RegisterDoublePref( |
| 143 prefs::kDefaultZoomLevel, | 148 prefs::kDefaultZoomLevel, |
| 144 0.0, | 149 0.0, |
| 145 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 150 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 146 registry->RegisterDictionaryPref( | 151 registry->RegisterDictionaryPref( |
| 147 prefs::kPerHostZoomLevels, | 152 prefs::kPerHostZoomLevels, |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 content::NotificationService::NoDetails()); | 255 content::NotificationService::NoDetails()); |
| 251 } | 256 } |
| 252 } | 257 } |
| 253 | 258 |
| 254 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 259 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
| 255 DCHECK(a && b); | 260 DCHECK(a && b); |
| 256 if (a->IsSameProfile(b)) | 261 if (a->IsSameProfile(b)) |
| 257 return false; | 262 return false; |
| 258 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 263 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 259 } | 264 } |
| OLD | NEW |