| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   84                                std::string(), |   84                                std::string(), | 
|   85                                PrefRegistrySyncable::UNSYNCABLE_PREF); |   85                                PrefRegistrySyncable::UNSYNCABLE_PREF); | 
|   86   registry->RegisterDoublePref(prefs::kDefaultZoomLevel, |   86   registry->RegisterDoublePref(prefs::kDefaultZoomLevel, | 
|   87                                0.0, |   87                                0.0, | 
|   88                                PrefRegistrySyncable::UNSYNCABLE_PREF); |   88                                PrefRegistrySyncable::UNSYNCABLE_PREF); | 
|   89   registry->RegisterDictionaryPref(prefs::kPerHostZoomLevels, |   89   registry->RegisterDictionaryPref(prefs::kPerHostZoomLevels, | 
|   90                                    PrefRegistrySyncable::UNSYNCABLE_PREF); |   90                                    PrefRegistrySyncable::UNSYNCABLE_PREF); | 
|   91   registry->RegisterStringPref(prefs::kDefaultApps, |   91   registry->RegisterStringPref(prefs::kDefaultApps, | 
|   92                                "install", |   92                                "install", | 
|   93                                PrefRegistrySyncable::UNSYNCABLE_PREF); |   93                                PrefRegistrySyncable::UNSYNCABLE_PREF); | 
 |   94 #if defined(OS_WIN) | 
 |   95   registry->RegisterBooleanPref(prefs::kProfileIconCreated, | 
 |   96                                 false, | 
 |   97                                 PrefRegistrySyncable::UNSYNCABLE_PREF); | 
 |   98 #endif | 
|   94 #if defined(OS_CHROMEOS) |   99 #if defined(OS_CHROMEOS) | 
|   95   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both |  100   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 
|   96   // local state and user's profile.  For other platforms we maintain |  101   // local state and user's profile.  For other platforms we maintain | 
|   97   // kApplicationLocale only in local state. |  102   // kApplicationLocale only in local state. | 
|   98   // In the future we may want to maintain kApplicationLocale |  103   // In the future we may want to maintain kApplicationLocale | 
|   99   // in user's profile for other platforms as well. |  104   // in user's profile for other platforms as well. | 
|  100   registry->RegisterStringPref(prefs::kApplicationLocale, |  105   registry->RegisterStringPref(prefs::kApplicationLocale, | 
|  101                                std::string(), |  106                                std::string(), | 
|  102                                PrefRegistrySyncable::SYNCABLE_PREF); |  107                                PrefRegistrySyncable::SYNCABLE_PREF); | 
|  103   registry->RegisterStringPref(prefs::kApplicationLocaleBackup, |  108   registry->RegisterStringPref(prefs::kApplicationLocaleBackup, | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  156  |  161  | 
|  157 void Profile::MaybeSendDestroyedNotification() { |  162 void Profile::MaybeSendDestroyedNotification() { | 
|  158   if (!sent_destroyed_notification_) { |  163   if (!sent_destroyed_notification_) { | 
|  159     sent_destroyed_notification_ = true; |  164     sent_destroyed_notification_ = true; | 
|  160     content::NotificationService::current()->Notify( |  165     content::NotificationService::current()->Notify( | 
|  161         chrome::NOTIFICATION_PROFILE_DESTROYED, |  166         chrome::NOTIFICATION_PROFILE_DESTROYED, | 
|  162         content::Source<Profile>(this), |  167         content::Source<Profile>(this), | 
|  163         content::NotificationService::NoDetails()); |  168         content::NotificationService::NoDetails()); | 
|  164   } |  169   } | 
|  165 } |  170 } | 
| OLD | NEW |