Chromium Code Reviews| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 97 prefs::kDefaultZoomLevel, | 97 prefs::kDefaultZoomLevel, |
| 98 0.0, | 98 0.0, |
| 99 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 99 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 100 registry->RegisterDictionaryPref( | 100 registry->RegisterDictionaryPref( |
| 101 prefs::kPerHostZoomLevels, | 101 prefs::kPerHostZoomLevels, |
| 102 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 102 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 103 registry->RegisterStringPref( | 103 registry->RegisterStringPref( |
| 104 prefs::kDefaultApps, | 104 prefs::kDefaultApps, |
| 105 "install", | 105 "install", |
| 106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 107 registry->RegisterIntegerPref( | |
| 108 prefs::kProfileIconVersion, | |
| 109 0, | |
|
gab
2013/06/18 15:36:58
Why is this an integer? As it is right now it is u
Alexei Svitkine (slow)
2013/06/18 15:44:32
See previous discussion. Having it an integer is m
gab
2013/06/18 15:51:38
Right, makes sense, I think it's pretty easy to ad
| |
| 110 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 107 #if defined(OS_CHROMEOS) | 111 #if defined(OS_CHROMEOS) |
| 108 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 112 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both |
| 109 // local state and user's profile. For other platforms we maintain | 113 // local state and user's profile. For other platforms we maintain |
| 110 // kApplicationLocale only in local state. | 114 // kApplicationLocale only in local state. |
| 111 // In the future we may want to maintain kApplicationLocale | 115 // In the future we may want to maintain kApplicationLocale |
| 112 // in user's profile for other platforms as well. | 116 // in user's profile for other platforms as well. |
| 113 registry->RegisterStringPref(prefs::kApplicationLocale, | 117 registry->RegisterStringPref(prefs::kApplicationLocale, |
| 114 std::string(), | 118 std::string(), |
| 115 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 119 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 116 registry->RegisterStringPref( | 120 registry->RegisterStringPref( |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 177 | 181 |
| 178 void Profile::MaybeSendDestroyedNotification() { | 182 void Profile::MaybeSendDestroyedNotification() { |
| 179 if (!sent_destroyed_notification_) { | 183 if (!sent_destroyed_notification_) { |
| 180 sent_destroyed_notification_ = true; | 184 sent_destroyed_notification_ = true; |
| 181 content::NotificationService::current()->Notify( | 185 content::NotificationService::current()->Notify( |
| 182 chrome::NOTIFICATION_PROFILE_DESTROYED, | 186 chrome::NOTIFICATION_PROFILE_DESTROYED, |
| 183 content::Source<Profile>(this), | 187 content::Source<Profile>(this), |
| 184 content::NotificationService::NoDetails()); | 188 content::NotificationService::NoDetails()); |
| 185 } | 189 } |
| 186 } | 190 } |
| OLD | NEW |