Bugfixes for the remoting setup wizard:

 1. Proper error message when directory rejects request - this requires changes in gaia_login.html to support custom error messages.
 2. Fixed login OTP-enabled account.

BUG=67218
TEST=None

Review URL: http://codereview.chromium.org/6178012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71277 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

diff --git a/chrome/browser/remoting/setup_flow_login_step.h b/chrome/browser/remoting/setup_flow_login_step.h
index a7d8911..6a41d99 100644
--- a/chrome/browser/remoting/setup_flow_login_step.h
+++ b/chrome/browser/remoting/setup_flow_login_step.h
@@ -15,6 +15,7 @@ namespace remoting {
 class SetupFlowLoginStep : public SetupFlowStepBase, public GaiaAuthConsumer {
  public:
   SetupFlowLoginStep();
+  SetupFlowLoginStep(const string16& error_message);
   virtual ~SetupFlowLoginStep();
 
   // SetupFlowStep implementation.
@@ -36,12 +37,15 @@ class SetupFlowLoginStep : public SetupFlowStepBase, public GaiaAuthConsumer {
  private:
   void OnUserSubmittedAuth(const std::string& user,
                            const std::string& password,
-                           const std::string& captcha);
+                           const std::string& captcha,
+                           const std::string& access_code);
 
   void ShowGaiaLogin(const DictionaryValue& args);
   void ShowGaiaSuccessAndSettingUp();
   void ShowGaiaFailed(const GoogleServiceAuthError& error);
 
+  string16 error_message_;
+
   // Fetcher to obtain the Chromoting Directory token.
   scoped_ptr<GaiaAuthFetcher> authenticator_;