| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 prefs::kPerHostZoomLevels, | 108 prefs::kPerHostZoomLevels, |
| 109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 110 registry->RegisterStringPref( | 110 registry->RegisterStringPref( |
| 111 prefs::kDefaultApps, | 111 prefs::kDefaultApps, |
| 112 "install", | 112 "install", |
| 113 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 113 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 114 registry->RegisterBooleanPref( | 114 registry->RegisterBooleanPref( |
| 115 prefs::kSpeechRecognitionFilterProfanities, | 115 prefs::kSpeechRecognitionFilterProfanities, |
| 116 true, | 116 true, |
| 117 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 117 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 118 registry->RegisterIntegerPref( |
| 119 prefs::kProfileIconVersion, |
| 120 0, |
| 121 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 118 #if defined(OS_CHROMEOS) | 122 #if defined(OS_CHROMEOS) |
| 119 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 123 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both |
| 120 // local state and user's profile. For other platforms we maintain | 124 // local state and user's profile. For other platforms we maintain |
| 121 // kApplicationLocale only in local state. | 125 // kApplicationLocale only in local state. |
| 122 // In the future we may want to maintain kApplicationLocale | 126 // In the future we may want to maintain kApplicationLocale |
| 123 // in user's profile for other platforms as well. | 127 // in user's profile for other platforms as well. |
| 124 registry->RegisterStringPref(prefs::kApplicationLocale, | 128 registry->RegisterStringPref(prefs::kApplicationLocale, |
| 125 std::string(), | 129 std::string(), |
| 126 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 130 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 127 registry->RegisterStringPref( | 131 registry->RegisterStringPref( |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 | 197 |
| 194 void Profile::MaybeSendDestroyedNotification() { | 198 void Profile::MaybeSendDestroyedNotification() { |
| 195 if (!sent_destroyed_notification_) { | 199 if (!sent_destroyed_notification_) { |
| 196 sent_destroyed_notification_ = true; | 200 sent_destroyed_notification_ = true; |
| 197 content::NotificationService::current()->Notify( | 201 content::NotificationService::current()->Notify( |
| 198 chrome::NOTIFICATION_PROFILE_DESTROYED, | 202 chrome::NOTIFICATION_PROFILE_DESTROYED, |
| 199 content::Source<Profile>(this), | 203 content::Source<Profile>(this), |
| 200 content::NotificationService::NoDetails()); | 204 content::NotificationService::NoDetails()); |
| 201 } | 205 } |
| 202 } | 206 } |
| OLD | NEW |