Merge 198866 "Move post-signin confirmation bubble to OneClickSi..."

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"
-#include "chrome/browser/signin/signin_tracker.h"
+#include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 class GURL;
 class ProfileIOData;
 
 namespace content {
 class WebContents;
 struct PasswordForm;
 }
 
 namespace net {
 class URLRequest;
 }
 
 // Per-tab one-click signin helper.  When a user signs in to a Google service
 // and the profile is not yet connected to a Google account, will start the
 // process of helping the user connect his profile with one click.  The process
 // begins with an infobar and is followed with a confirmation dialog explaining
 // more about what this means.
 class OneClickSigninHelper
     : public content::WebContentsObserver,
       public content::WebContentsUserData<OneClickSigninHelper>,
-      public SigninTracker::Observer,
       public ProfileSyncServiceObserver {
  public:
   // Represents user's decision about sign in process.
   enum AutoAccept {
     // User decision not yet known.  Assume cancel.
     AUTO_ACCEPT_NONE,
 
     // User has explicitly accepted to sign in.  A bubble is shown with the
     // option to start sync, configure it first, or abort.
     AUTO_ACCEPT_ACCEPTED,
@@ skipping 133 matching lines @@
   // when the sign process is over and to collect infomation from the user
   // entered on the Gaia sign in page (for explicit sign ins).
   static void ShowInfoBarUIThread(const std::string& session_index,
                                   const std::string& email,
                                   AutoAccept auto_accept,
                                   SyncPromoUI::Source source,
                                   const GURL& continue_url,
                                   int child_id,
                                   int route_id);
 
-  void RedirectToNtpOrAppsPage(bool show_bubble);
+  void RedirectToNtpOrAppsPage();
   void RedirectToSignin();
-  void ShowSyncConfirmationBubble(bool show_bubble);
+  void ShowSigninErrorBubble(const std::string& error);
 
   // Clear all data member of the helper, except for the error.
   void CleanTransientState();
 
   // Grab Gaia password if available.
   bool OnFormSubmitted(const content::PasswordForm& form);
 
   // content::WebContentsObserver overrides.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void NavigateToPendingEntry(
       const GURL& url,
       content::NavigationController::ReloadType reload_type) 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;
-
   // ProfileSyncServiceObserver.
   virtual void OnStateChanged() OVERRIDE;
 
   // Tracks if we are in the process of showing the signin or one click
   // interstitial page. It's set to true the first time we load one of those
   // pages and set to false when transient state is cleaned.
   // Note: This should only be used for logging purposes.
   bool showing_signin_;
 
   // 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_;
   bool switched_to_advanced_;
   // When switching to advanced settings, we want to track the original source.
   SyncPromoUI::Source original_source_;
   GURL continue_url_;
   // Redirect URL after sync setup is complete.
   GURL redirect_url_;
   std::string error_message_;
-  scoped_ptr<SigninTracker> signin_tracker_;
 
   // Number of navigations since starting a sign in that is outside the
   // the set of trusted Gaia URLs.  Sign in attempts that include visits to
   // one more untrusted will cause a modal dialog to appear asking the user
   // to confirm, similar to the interstitial flow.
   int untrusted_navigations_since_signin_visit_;
 
   // Whether a Gaia URL during the sign in process was not handled by the
   // dedicated sign in process (e.g. SAML login, which redirects to a
   // non-google-controlled domain).
   // This is set to true if at least one such URL is detected.
-  bool confirmation_required_;
+  bool untrusted_confirmation_required_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_