Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
index f1f3044372c210985d7379b2a9db994eda4f49df..963a473906b300da37483c37c6f4bd602627420b 100644 |
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
@@ -19,7 +19,6 @@ |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/web_ui_message_handler.h" |
-#include "google_apis/gaia/gaia_auth_consumer.h" |
#include "google_apis/gaia/gaia_oauth_client.h" |
class GaiaAuthFetcher; |
@@ -33,7 +32,6 @@ class ListValue; |
class UserManagerScreenHandler |
: public content::WebUIMessageHandler, |
public proximity_auth::ScreenlockBridge::LockHandler, |
- public GaiaAuthConsumer, |
public gaia::GaiaOAuthClient::Delegate, |
public content::NotificationObserver { |
public: |
@@ -88,9 +86,6 @@ class UserManagerScreenHandler |
scoped_ptr<base::DictionaryValue> token_info) override; |
void OnOAuthError() override; |
void OnNetworkError(int response_code) override; |
- // ClientLogin is deprecated |
- void OnClientLoginSuccess(const ClientLoginResult& result) override; |
- void OnClientLoginFailure(const GoogleServiceAuthError& error) override; |
// Handle when Notified of a NOTIFICATION_BROWSER_WINDOW_READY event. |
void OnBrowserWindowReady(Browser* browser); |
@@ -115,13 +110,12 @@ class UserManagerScreenHandler |
// Authenticator used when local-auth fails. |
scoped_ptr<gaia::GaiaOAuthClient> oauth_client_; |
- scoped_ptr<GaiaAuthFetcher> client_login_; |
- // The index of the profile currently being authenticated. |
- size_t authenticating_profile_index_; |
+ // The path of the profile currently being authenticated. |
+ base::FilePath authenticating_profile_path_; |
// Login email and password, held during on-line auth for later use. |
- base::string16 email_address_; |
+ std::string email_address_; |
std::string password_attempt_; |
// URL hash, used to key post-profile actions if present. |