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