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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 10 years, 1 month 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 virtual void LoginOffTheRecord(); 81 virtual void LoginOffTheRecord();
82 virtual void ClearErrors(); 82 virtual void ClearErrors();
83 virtual void OnUserSelected(UserController* source); 83 virtual void OnUserSelected(UserController* source);
84 virtual void ActivateWizard(const std::string& screen_name); 84 virtual void ActivateWizard(const std::string& screen_name);
85 virtual void RemoveUser(UserController* source); 85 virtual void RemoveUser(UserController* source);
86 virtual void AddStartUrl(const GURL& start_url) { start_url_ = start_url; } 86 virtual void AddStartUrl(const GURL& start_url) { start_url_ = start_url; }
87 virtual void SelectUser(int index); 87 virtual void SelectUser(int index);
88 virtual void SetStatusAreaEnabled(bool enable); 88 virtual void SetStatusAreaEnabled(bool enable);
89 89
90 // LoginPerformer::Delegate implementation: 90 // LoginPerformer::Delegate implementation:
91 virtual void SetLoginFailure(const LoginFailure& error);
91 virtual void OnLoginFailure(const LoginFailure& error); 92 virtual void OnLoginFailure(const LoginFailure& error);
92 virtual void OnLoginSuccess( 93 virtual void OnLoginSuccess(
93 const std::string& username, 94 const std::string& username,
94 const std::string& password, 95 const std::string& password,
95 const GaiaAuthConsumer::ClientLoginResult& credentials, 96 const GaiaAuthConsumer::ClientLoginResult& credentials,
96 bool pending_requests); 97 bool pending_requests);
97 virtual void OnOffTheRecordLoginSuccess(); 98 virtual void OnOffTheRecordLoginSuccess();
98 virtual void OnPasswordChangeDetected( 99 virtual void OnPasswordChangeDetected(
99 const GaiaAuthConsumer::ClientLoginResult& credentials); 100 const GaiaAuthConsumer::ClientLoginResult& credentials);
100 virtual void WhiteListCheckFailed(const std::string& email); 101 virtual void WhiteListCheckFailed(const std::string& email);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 163
163 // URL that will be opened on browser startup. 164 // URL that will be opened on browser startup.
164 GURL start_url_; 165 GURL start_url_;
165 166
166 // Help application used for help dialogs. 167 // Help application used for help dialogs.
167 scoped_ptr<HelpAppLauncher> help_app_; 168 scoped_ptr<HelpAppLauncher> help_app_;
168 169
169 // A user settings provider instance to trigger settings cache update. 170 // A user settings provider instance to trigger settings cache update.
170 scoped_ptr<UserCrosSettingsProvider> user_settings_; 171 scoped_ptr<UserCrosSettingsProvider> user_settings_;
171 172
173 // True if there was a two-factor error during login.
174 bool two_factor_error_;
175
172 DISALLOW_COPY_AND_ASSIGN(ExistingUserController); 176 DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
173 }; 177 };
174 178
175 } // namespace chromeos 179 } // namespace chromeos
176 180
177 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 181 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698