| 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 #if defined(OS_WIN) | 
 |  108   registry->RegisterBooleanPref( | 
 |  109       prefs::kProfileIconCreated, | 
 |  110       false, | 
 |  111       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 
 |  112 #endif | 
|  107 #if defined(OS_CHROMEOS) |  113 #if defined(OS_CHROMEOS) | 
|  108   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both |  114   // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both | 
|  109   // local state and user's profile.  For other platforms we maintain |  115   // local state and user's profile.  For other platforms we maintain | 
|  110   // kApplicationLocale only in local state. |  116   // kApplicationLocale only in local state. | 
|  111   // In the future we may want to maintain kApplicationLocale |  117   // In the future we may want to maintain kApplicationLocale | 
|  112   // in user's profile for other platforms as well. |  118   // in user's profile for other platforms as well. | 
|  113   registry->RegisterStringPref(prefs::kApplicationLocale, |  119   registry->RegisterStringPref(prefs::kApplicationLocale, | 
|  114                                std::string(), |  120                                std::string(), | 
|  115                                user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |  121                                user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 
|  116   registry->RegisterStringPref( |  122   registry->RegisterStringPref( | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  178  |  184  | 
|  179 void Profile::MaybeSendDestroyedNotification() { |  185 void Profile::MaybeSendDestroyedNotification() { | 
|  180   if (!sent_destroyed_notification_) { |  186   if (!sent_destroyed_notification_) { | 
|  181     sent_destroyed_notification_ = true; |  187     sent_destroyed_notification_ = true; | 
|  182     content::NotificationService::current()->Notify( |  188     content::NotificationService::current()->Notify( | 
|  183         chrome::NOTIFICATION_PROFILE_DESTROYED, |  189         chrome::NOTIFICATION_PROFILE_DESTROYED, | 
|  184         content::Source<Profile>(this), |  190         content::Source<Profile>(this), | 
|  185         content::NotificationService::NoDetails()); |  191         content::NotificationService::NoDetails()); | 
|  186   } |  192   } | 
|  187 } |  193 } | 
| OLD | NEW |