Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Side by Side Diff: components/signin/core/browser/signin_manager.h

Issue 913123005: Reauth causes a MergeSession, so the cookie jar gets re-authed too. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pre-review checkup Created 5 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // The signin manager encapsulates some functionality tracking 5 // The signin manager encapsulates some functionality tracking
6 // which user is signed in. See SigninManagerBase for full description of 6 // which user is signed in. See SigninManagerBase for full description of
7 // responsibilities. The class defined in this file provides functionality 7 // responsibilities. The class defined in this file provides functionality
8 // required by all platforms except Chrome OS. 8 // required by all platforms except Chrome OS.
9 // 9 //
10 // When a user is signed in, a ClientLogin request is run on their behalf. 10 // When a user is signed in, a ClientLogin request is run on their behalf.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // Sign a user out, removing the preference, erasing all keys 93 // Sign a user out, removing the preference, erasing all keys
94 // associated with the user, and canceling all auth in progress. 94 // associated with the user, and canceling all auth in progress.
95 virtual void SignOut(signin_metrics::ProfileSignout signout_source_metric); 95 virtual void SignOut(signin_metrics::ProfileSignout signout_source_metric);
96 96
97 // On platforms where SigninManager is responsible for dealing with 97 // On platforms where SigninManager is responsible for dealing with
98 // invalid username policy updates, we need to check this during 98 // invalid username policy updates, we need to check this during
99 // initialization and sign the user out. 99 // initialization and sign the user out.
100 void Initialize(PrefService* local_state) override; 100 void Initialize(PrefService* local_state) override;
101 void Shutdown() override; 101 void Shutdown() override;
102 102
103 // If applicable, merge the signed in account into the cookie jar.
104 void MergeSigninCredentialIntoCookieJar();
105
103 // Invoked from an OAuthTokenFetchedCallback to complete user signin. 106 // Invoked from an OAuthTokenFetchedCallback to complete user signin.
104 virtual void CompletePendingSignin(); 107 virtual void CompletePendingSignin();
105 108
106 // Invoked from SigninManagerAndroid to indicate that the sign-in process 109 // Invoked from SigninManagerAndroid to indicate that the sign-in process
107 // has completed for |username|. 110 // has completed for |username|.
108 void OnExternalSigninCompleted(const std::string& username); 111 void OnExternalSigninCompleted(const std::string& username);
109 112
110 // Returns true if there's a signin in progress. 113 // Returns true if there's a signin in progress.
111 bool AuthInProgress() const override; 114 bool AuthInProgress() const override;
112 115
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 bool user_info_fetched_by_account_tracker_; 236 bool user_info_fetched_by_account_tracker_;
234 237
235 base::WeakPtrFactory<SigninManager> weak_pointer_factory_; 238 base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
236 239
237 DISALLOW_COPY_AND_ASSIGN(SigninManager); 240 DISALLOW_COPY_AND_ASSIGN(SigninManager);
238 }; 241 };
239 242
240 #endif // !defined(OS_CHROMEOS) 243 #endif // !defined(OS_CHROMEOS)
241 244
242 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_MANAGER_H_ 245 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | components/signin/core/browser/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698