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/signin/signin_manager_factory.h" | 5 #include "chrome/browser/signin/signin_manager_factory.h" |
6 | 6 |
7 #include "base/prefs/pref_registry_simple.h" | 7 #include "base/prefs/pref_registry_simple.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 10 #include "chrome/browser/signin/chrome_signin_client_factory.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 std::string(), | 81 std::string(), |
82 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 82 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
83 registry->RegisterStringPref( | 83 registry->RegisterStringPref( |
84 prefs::kGoogleServicesUserAccountId, | 84 prefs::kGoogleServicesUserAccountId, |
85 std::string(), | 85 std::string(), |
86 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 86 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
87 registry->RegisterStringPref( | 87 registry->RegisterStringPref( |
88 prefs::kGoogleServicesUsername, | 88 prefs::kGoogleServicesUsername, |
89 std::string(), | 89 std::string(), |
90 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 90 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 91 registry->RegisterStringPref( |
| 92 prefs::kGoogleServicesSigninScopedDeviceId, |
| 93 std::string(), |
| 94 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
91 registry->RegisterBooleanPref( | 95 registry->RegisterBooleanPref( |
92 prefs::kAutologinEnabled, | 96 prefs::kAutologinEnabled, |
93 true, | 97 true, |
94 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 98 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
95 registry->RegisterBooleanPref( | 99 registry->RegisterBooleanPref( |
96 prefs::kReverseAutologinEnabled, | 100 prefs::kReverseAutologinEnabled, |
97 true, | 101 true, |
98 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 102 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
99 registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, | 103 registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, |
100 new base::ListValue, | 104 new base::ListValue, |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 } | 143 } |
140 | 144 |
141 void SigninManagerFactory::BrowserContextShutdown( | 145 void SigninManagerFactory::BrowserContextShutdown( |
142 content::BrowserContext* context) { | 146 content::BrowserContext* context) { |
143 SigninManagerBase* manager = static_cast<SigninManagerBase*>( | 147 SigninManagerBase* manager = static_cast<SigninManagerBase*>( |
144 GetServiceForBrowserContext(context, false)); | 148 GetServiceForBrowserContext(context, false)); |
145 if (manager) | 149 if (manager) |
146 FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerShutdown(manager)); | 150 FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerShutdown(manager)); |
147 BrowserContextKeyedServiceFactory::BrowserContextShutdown(context); | 151 BrowserContextKeyedServiceFactory::BrowserContextShutdown(context); |
148 } | 152 } |
OLD | NEW |