Index: trunk/src/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h |
=================================================================== |
--- trunk/src/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h (revision 275548) |
+++ trunk/src/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h (working copy) |
@@ -75,59 +75,7 @@ |
// WebUI message handlers. |
void HandleFrameLoadingCompleted(int status); |
- void HandleCompleteAuthentication(const std::string& email, |
- const std::string& password, |
- const std::string& auth_code); |
- void HandleCompleteLogin(const std::string& typed_email, |
- const std::string& password, |
- bool using_saml); |
- void HandleUsingSAMLAPI(); |
- void HandleScrapedPasswordCount(int password_count); |
- void HandleScrapedPasswordVerificationFailed(); |
- |
- void HandleGaiaUIReady(); |
- |
- // Fill GAIA user name. |
- void PopulateEmail(const std::string& user_id); |
- |
- // Mark user as having password changed: |
- void PasswordChangedFor(const std::string& user_id); |
- |
- // Kick off cookie / local storage cleanup. |
- void StartClearingCookies(const base::Closure& on_clear_callback); |
- void OnCookiesCleared(const base::Closure& on_clear_callback); |
- |
- // Kick off DNS cache flushing. |
- void StartClearingDnsCache(); |
- void OnDnsCleared(); |
- |
- // Show sign-in screen for the given credentials. |
- virtual void ShowSigninScreenForCreds(const std::string& username, |
- const std::string& password); |
- // Attempts login for test. |
- void SubmitLoginFormForTest(); |
- |
- // Updates the member variable and UMA histogram indicating whether the |
- // principals API was used during SAML login. |
- void SetSAMLPrincipalsAPIUsed(bool api_used); |
- |
- void ShowGaia(); |
- |
- // Shows signin screen after dns cache and cookie cleanup operations finish. |
- void ShowGaiaScreenIfReady(); |
- |
- // Decides whether an auth extension should be pre-loaded. If it should, |
- // pre-loads it. |
- void MaybePreloadAuthExtension(); |
- |
- // Tells webui to load authentication extension. |force| is used to force the |
- // extension reloading, if it has already been loaded. |silent_load| is true |
- // for cases when extension should be loaded in the background and it |
- // shouldn't grab the focus. |offline| is true when offline version of the |
- // extension should be used. |
- void LoadAuthExtension(bool force, bool silent_load, bool offline); |
- |
// TODO (ygorshenin@): GaiaScreenHandler should implement |
// NetworkStateInformer::Observer. |
void UpdateState(ErrorScreenActor::ErrorReason reason); |
@@ -135,8 +83,6 @@ |
// TODO (ygorshenin@): remove this dependency. |
void SetSigninScreenHandler(SigninScreenHandler* handler); |
- SigninScreenHandlerDelegate* Delegate(); |
- |
// Current state of Gaia frame. |
FrameState frame_state_; |
@@ -146,47 +92,12 @@ |
// Network state informer used to keep signin screen up. |
scoped_refptr<NetworkStateInformer> network_state_informer_; |
- // Email to pre-populate with. |
- std::string populated_email_; |
- |
- // Emails of the users, whose passwords have recently been changed. |
- std::set<std::string> password_changed_for_; |
- |
- // True if dns cache cleanup is done. |
- bool dns_cleared_; |
- |
- // True if DNS cache task is already running. |
- bool dns_clear_task_running_; |
- |
- // True if cookie jar cleanup is done. |
- bool cookies_cleared_; |
- |
- // Is focus still stolen from Gaia page? |
- bool focus_stolen_; |
- |
- // Has Gaia page silent load been started for the current sign-in attempt? |
- bool gaia_silent_load_; |
- |
- // The active network at the moment when Gaia page was preloaded. |
- std::string gaia_silent_load_network_; |
- |
- // If the user authenticated via SAML, this indicates whether the principals |
- // API was used. |
- bool using_saml_api_; |
- |
- // Test credentials. |
- std::string test_user_; |
- std::string test_pass_; |
- bool test_expects_complete_login_; |
- |
// Non-owning ptr to SigninScreenHandler instance. Should not be used |
// in dtor. |
// TODO (ygorshenin@): GaiaScreenHandler shouldn't communicate with |
// signin_screen_handler directly. |
SigninScreenHandler* signin_screen_handler_; |
- base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; |
- |
DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); |
}; |