chrome/browser/signin/signin_manager_factory.cc - Issue 11938007: Don't use request user data during one-click sign in

Side by Side Diff: chrome/browser/signin/signin_manager_factory.cc

Issue 11938007: Don't use request user data during one-click sign in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper.h » ('j') | chrome/browser/ui/sync/one_click_signin_helper.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/prefs/pref_service.h"	7 #include "chrome/browser/prefs/pref_service.h"

8 #include "chrome/browser/profiles/profile_dependency_manager.h"	8 #include "chrome/browser/profiles/profile_dependency_manager.h"

9 #include "chrome/browser/signin/signin_manager.h"	9 #include "chrome/browser/signin/signin_manager.h"

10 #include "chrome/browser/signin/token_service_factory.h"	10 #include "chrome/browser/signin/token_service_factory.h"

(...skipping 26 matching lines...) Expand all Loading...
37	37

38 void SigninManagerFactory::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {	38 void SigninManagerFactory::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {

39 user_prefs->RegisterStringPref(prefs::kGoogleServicesLastUsername, "",	39 user_prefs->RegisterStringPref(prefs::kGoogleServicesLastUsername, "",

40 PrefServiceSyncable::UNSYNCABLE_PREF);	40 PrefServiceSyncable::UNSYNCABLE_PREF);

41 user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "",	41 user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "",

42 PrefServiceSyncable::UNSYNCABLE_PREF);	42 PrefServiceSyncable::UNSYNCABLE_PREF);

43 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,	43 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,

44 PrefServiceSyncable::UNSYNCABLE_PREF);	44 PrefServiceSyncable::UNSYNCABLE_PREF);

45 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true,	45 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true,

46 PrefServiceSyncable::UNSYNCABLE_PREF);	46 PrefServiceSyncable::UNSYNCABLE_PREF);

	47 user_prefs->RegisterStringPref(prefs::kReverseAutologinPendingEmail, "",

	48 PrefServiceSyncable::UNSYNCABLE_PREF);

47 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,	49 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,

48 new ListValue,	50 new ListValue,

49 PrefServiceSyncable::UNSYNCABLE_PREF);	51 PrefServiceSyncable::UNSYNCABLE_PREF);

50 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false,	52 user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false,

51 PrefServiceSyncable::UNSYNCABLE_PREF);	53 PrefServiceSyncable::UNSYNCABLE_PREF);

52 }	54 }

53	55

54 // static	56 // static

55 void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) {	57 void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) {

56 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "");	58 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "");

57 }	59 }

58	60

59 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(	61 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(

60 Profile* profile) const {	62 Profile* profile) const {

61 SigninManager* service = new SigninManager();	63 SigninManager* service = new SigninManager();

62 service->Initialize(profile);	64 service->Initialize(profile);

63 return service;	65 return service;

64 }	66 }

OLD	NEW