Make sure to display an errors that occur during the chrome sign in process

chrome/browser/ui/sync/one_click_signin_helper.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 32 matching lines @@
     AUTO_ACCEPT_EXPLICIT
   };
 
   // Return value of CanOfferOnIOThread().
   enum Offer {
     CAN_OFFER,
     DONT_OFFER,
     IGNORE_REQUEST
   };
 
+  // Argument to CanOffer().
+  enum CanOfferFor {
+    CAN_OFFER_FOR_ALL,
+    CAN_OFFER_FOR_INTERSTITAL_ONLY,
+  };
+
   virtual ~OneClickSigninHelper();
 
   // Called only by tests to associate information with a given request.
   static void AssociateWithRequestForTesting(base::SupportsUserData* request,
                                              const std::string& email);
 
   // Returns true if the one-click signin feature can be offered at this time.
-  // It can be offered if the contents is not in an incognito window.  If
-  // |check_connected| is true, then the profile is checked to see if it's
+  // If |email| is not empty, then the profile is checked to see if it's
   // already connected to a google account or if the user has already rejected
   // one-click sign-in with this email, in which cases a one click signin
   // should not be offered.
+  //
+  // If |can_offer_for| is |CAN_OFFER_FOR_INTERSTITAL_ONLY|, then only do the
+  // checks that would affect the interstitial page.  Otherwise, do the checks
+  // that would affect the interstitial and the explicit sign ins.
+  //
+  // Returns an explanation as a string resource ID for why one-clicked cannot

[Andrew T Wilson (Slow), 2012/12/04 11:14:06]

nit: clicked->click

mention that error_message_id can be null

also, error_string_id -> error_message_id in the comment.

[Roger Tawa OOO till Jul 10th, 2012/12/04 15:23:25]

Done.

+  // be offered in |error_string_id|.  |error_string_id| is valid only if
+  // the return value is false.
   static bool CanOffer(content::WebContents* web_contents,
+                       CanOfferFor can_offer_for,
                        const std::string& email,
-                       bool check_connected);
+                       int* error_message_id);
 
   // Returns true if the one-click signin feature can be offered at this time.
   // It can be offered if the io_data is not in an incognito window and if the
   // origin of |url| is a valid Gaia sign in origin.  This function is meant
   // to called only from the IO thread.
   static Offer CanOfferOnIOThread(net::URLRequest* request,
                                   ProfileIOData* io_data);
 
   // Initialize a finch experiment for the infobar.
   static void InitializeFieldTrial();
@@ skipping 42 matching lines @@
                                       ProfileIOData* io_data);
 
   // The portion of ShowInfoBarIfPossible() that needs to run on the UI thread.
   static void ShowInfoBarUIThread(const std::string& session_index,
                                   const std::string& email,
                                   AutoAccept auto_accept,
                                   SyncPromoUI::Source source,
                                   int child_id,
                                   int route_id);
 
+  void RedirectToNTP();
+
+  // Clear all data member of the helper, except for the error.
+  void CleanTransientState();
+
   // content::WebContentsObserver overrides.
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;
 
   // SigninTracker::Observer override.
   virtual void GaiaCredentialsValid() OVERRIDE;
   virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
   virtual void SigninSuccess() OVERRIDE;
 
   // Information about the account that has just logged in.
   std::string session_index_;
   std::string email_;
   std::string password_;
   AutoAccept auto_accept_;
   SyncPromoUI::Source source_;
+  std::string error_message_;
+
   scoped_ptr<SigninTracker> signin_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_