Win: Display a native bubble (instead of the JS one) after the web signin flow.

chrome/browser/ui/sync/one_click_signin_helper.cc

 // 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 395 matching lines @@
   virtual void DidStopLoading(content::RenderViewHost* render_view_host)
       OVERRIDE;
 
  private:
   scoped_ptr<content::WebContents> contents_;
   int history_index_to_remove_;
 
   DISALLOW_COPY_AND_ASSIGN(CurrentHistoryCleaner);
 };
 
-
 CurrentHistoryCleaner::CurrentHistoryCleaner(content::WebContents* contents)
     : WebContentsObserver(contents) {
   content::NavigationController& nc = web_contents()->GetController();
   history_index_to_remove_ = nc.GetLastCommittedEntryIndex();
 }
 
 void CurrentHistoryCleaner::DidStopLoading(
     content::RenderViewHost* render_view_host) {
   content::NavigationController& nc = web_contents()->GetController();
   // Have to wait until something else gets added to history before removal.
@@ skipping 358 matching lines @@
 
   if (source != SyncPromoUI::SOURCE_UNKNOWN &&
       helper->source_ == SyncPromoUI::SOURCE_UNKNOWN) {
     helper->source_ = source;
   }
 
   CanOfferFor can_offer_for =
       (auto_accept != AUTO_ACCEPT_EXPLICIT &&
           helper->auto_accept_ != AUTO_ACCEPT_EXPLICIT) ?
           CAN_OFFER_FOR_INTERSTITAL_ONLY : CAN_OFFER_FOR_ALL;
+
   std::string error_message;
 
   if (!web_contents || !CanOffer(web_contents, can_offer_for, email,
                                  &error_message)) {
     VLOG(1) << "OneClickSigninHelper::ShowInfoBarUIThread: not offering";
     if (helper && helper->error_message_.empty() && !error_message.empty())
       helper->error_message_ = error_message;
 
     return;
   }
@@ skipping 20 matching lines @@
   if (continue_url.is_valid())
     helper->continue_url_ = continue_url;
 }
 
 // static
 void OneClickSigninHelper::RemoveCurrentHistoryItem(
     content::WebContents* web_contents) {
   new CurrentHistoryCleaner(web_contents);  // will self-destruct when finished
 }
 
+void OneClickSigninHelper::ShowSyncConfirmationBubble(bool show_bubble) {
+  if (show_bubble) {
+    content::WebContents* contents = web_contents();
+    Profile* profile =
+        Profile::FromBrowserContext(contents->GetBrowserContext());
+    Browser* browser = chrome::FindBrowserWithWebContents(contents);
+
+    browser->window()->ShowOneClickSigninBubble(
+        BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
+        string16(), /* no SAML email */
+        UTF8ToUTF16(error_message_),
+        base::Bind(&StartSync,
+                   StartSyncArgs(profile, browser, AUTO_ACCEPT_ACCEPTED,
+                                 session_index_, email_, password_,
+                                 false)));
+  }
+  error_message_.clear();
+}
+
 void OneClickSigninHelper::RedirectToNtpOrAppsPage(bool show_bubble) {
   VLOG(1) << "OneClickSigninHelper::RedirectToNtpOrAppsPage";
 
-  // Redirect to NTP/Apps page with sign in bubble visible.
+  // Redirect to NTP/Apps page and display a confirmation bubble
   content::WebContents* contents = web_contents();
-  Profile* profile =
-      Profile::FromBrowserContext(contents->GetBrowserContext());
-  PrefService* pref_service = profile->GetPrefs();
-  if (show_bubble) {
-    pref_service->SetBoolean(prefs::kSyncPromoShowNTPBubble, true);
-    pref_service->SetString(prefs::kSyncPromoErrorMessage, error_message_);
-  }
-
   GURL url(chrome::IsInstantExtendedAPIEnabled() ?
            chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
   content::OpenURLParams params(url,
                                 content::Referrer(),
                                 CURRENT_TAB,
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                 false);
   contents->OpenURL(params);
 
-  error_message_.clear();
+  ShowSyncConfirmationBubble(show_bubble);
 }
 
 void OneClickSigninHelper::RedirectToSignin() {
   VLOG(1) << "OneClickSigninHelper::RedirectToSignin";
 
   // Extract the existing sounce=X value.  Default to "2" if missing.
   SyncPromoUI::Source source =
       SyncPromoUI::GetSourceForSyncPromoURL(continue_url_);
   if (source == SyncPromoUI::SOURCE_UNKNOWN)
     source = SyncPromoUI::SOURCE_MENU;
@@ skipping 212 matching lines @@
       if (SyncPromoUI::UseWebBasedSigninFlow() && showing_signin_)
           LogOneClickHistogramValue(one_click_signin::HISTOGRAM_DISMISSED);
       break;
     case AUTO_ACCEPT_ACCEPTED:
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_ACCEPTED);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_WITH_DEFAULTS);
       SigninManager::DisableOneClickSignIn(profile);
       browser->window()->ShowOneClickSigninBubble(
           bubble_type,
           UTF8ToUTF16(email_),
+          string16(), /* no error message to display */
           base::Bind(&StartSync,
                      StartSyncArgs(profile, browser, auto_accept_,
                                    session_index_, email_, password_,
                                    false /* force_same_tab_navigation */)));
       break;
     case AUTO_ACCEPT_CONFIGURE:
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_ACCEPTED);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_WITH_ADVANCED);
       SigninManager::DisableOneClickSignIn(profile);
       StartSync(
@@ skipping 18 matching lines @@
 
       std::string last_email =
           profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
 
       if (!is_trusted_) {
         // The user has navigated away from valid Gaia URLs during sign in,
         // verify this sign in is desired.
         browser->window()->ShowOneClickSigninBubble(
             BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_SAML_MODAL_DIALOG,
             UTF8ToUTF16(email_),
+            string16(), /* no error message to display */
             base::Bind(&StartSync,
                        StartSyncArgs(profile, browser, auto_accept_,
                                      session_index_, email_, password_,
                                      force_same_tab_navigation)));
       } else if (!last_email.empty() && last_email != email_) {
         // If the new email address is different from the email address that
         // just signed in, show a confirmation dialog.
         ConfirmEmailDialogDelegate::AskForConfirmation(
             contents,
             last_email,
@@ skipping 96 matching lines @@
         // If the user cancelled signin, then no need to display any error
         // messages or anything - just go back to the NTP.
         error_message_.clear();
         display_bubble = false;
         break;
       default:
         error_message_ = l10n_util::GetStringUTF8(IDS_SYNC_ERROR_SIGNING_IN);
         break;
     }
   }
-  RedirectOnSigninComplete(display_bubble);
+  ShowSyncConfirmationBubble(display_bubble);
+  signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
-  RedirectOnSigninComplete(true);
-}
-
-void OneClickSigninHelper::RedirectOnSigninComplete(bool show_bubble) {
-  // Show the result in the sign-in bubble if desired.
-  RedirectToNtpOrAppsPage(show_bubble);
+  ShowSyncConfirmationBubble(true);
   signin_tracker_.reset();
 }