Show email confirmation for sign in from the hot-dog menu

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 85 matching lines @@
       SyncPromoUI::Source source);
 
   Profile* profile;
   Browser* browser;
   OneClickSigninHelper::AutoAccept auto_accept;
   std::string session_index;
   std::string email;
   std::string password;
   bool force_same_tab_navigation;
   OneClickSigninSyncStarter::ConfirmationRequired confirmation_required;
+  SyncPromoUI::Source source;
 };
 
 StartSyncArgs::StartSyncArgs(
     Profile* profile,
     Browser* browser,
     OneClickSigninHelper::AutoAccept auto_accept,
     const std::string& session_index,
     const std::string& email,
     const std::string& password,
     bool force_same_tab_navigation,
     bool untrusted_confirmation_required,
     SyncPromoUI::Source source)
     : profile(profile),
       browser(browser),
       auto_accept(auto_accept),
       session_index(session_index),
       email(email),
       password(password),
-      force_same_tab_navigation(force_same_tab_navigation) {
+      force_same_tab_navigation(force_same_tab_navigation),
+      source(source) {
   if (untrusted_confirmation_required) {
     confirmation_required = OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN;
   } else if (source == SyncPromoUI::SOURCE_SETTINGS ||
              source == SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
     // Do not display a status confirmation for webstore installs or re-auth.
     confirmation_required = OneClickSigninSyncStarter::NO_CONFIRMATION;
   } else {
     confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
   }
 }
@@ skipping 53 matching lines @@
                             one_click_signin::HISTOGRAM_MAX);
 }
 
 void LogOneClickHistogramValue(int action) {
   UMA_HISTOGRAM_ENUMERATION("Signin.OneClickActions", action,
                             one_click_signin::HISTOGRAM_MAX);
   UMA_HISTOGRAM_ENUMERATION("Signin.AllAccessPointActions", action,
                             one_click_signin::HISTOGRAM_MAX);
 }
 
+void RedirectToNtpOrAppsPage(content::WebContents* contents,
+                             SyncPromoUI::Source source) {
+  VLOG(1) << "RedirectToNtpOrAppsPage";
+  // Redirect to NTP/Apps page and display a confirmation bubble
+  GURL url(source == SyncPromoUI::SOURCE_APPS_PAGE_LINK ?
+           chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
+  content::OpenURLParams params(url,
+                                content::Referrer(),
+                                CURRENT_TAB,
+                                content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                false);
+  contents->OpenURL(params);
+}
+
+// If the |source| is not settings page/webstore, redirects to
+// the NTP/Apps page.
+void RedirectToNtpOrAppsPageIfNecessary(content::WebContents* contents,
+                                        SyncPromoUI::Source source) {
+  if (source != SyncPromoUI::SOURCE_SETTINGS &&
+      source != SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
+    RedirectToNtpOrAppsPage(contents, source);
+  }
+}
+
 // Start syncing with the given user information.
 void StartSync(const StartSyncArgs& args,
                OneClickSigninSyncStarter::StartSyncMode start_mode) {
   if (start_mode == OneClickSigninSyncStarter::UNDO_SYNC) {
     LogOneClickHistogramValue(one_click_signin::HISTOGRAM_UNDO);
     return;
   }
 
   // If we are giving the user the option to configure sync, then that will
   // suffice as a confirmation.
@@ skipping 39 matching lines @@
                        OneClickSigninSyncStarter::StartSyncMode start_mode,
                        int button) {
   if (button == IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_OK_BUTTON) {
     contents->GetController().LoadURL(
         GURL(chrome::kChromeUINewTabURL), content::Referrer(),
         content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
     chrome::ShowSettingsSubPage(args.browser,
                                 std::string(chrome::kSearchUsersSubPage));
   } else {
     StartSync(args, start_mode);
+    RedirectToNtpOrAppsPageIfNecessary(contents, args.source);
   }
 }
 
 void ClearPendingEmailOnIOThread(content::ResourceContext* context) {
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
   DCHECK(io_data);
   io_data->set_reverse_autologin_pending_email(std::string());
 }
 
 // Determines the source of the sign in and the continue URL.  Its either one
@@ skipping 602 matching lines @@
   browser->window()->ShowOneClickSigninBubble(
       BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
       string16(), /* no SAML email */
       UTF8ToUTF16(error),
       // This callback is never invoked.
       // TODO(rogerta): Separate out the bubble API so we don't have to pass
       // ignored |email| and |callback| params.
       BrowserWindow::StartSyncCallback());
 }
 
-void OneClickSigninHelper::RedirectToNtpOrAppsPage() {
-  VLOG(1) << "OneClickSigninHelper::RedirectToNtpOrAppsPage";
-  // Redirect to NTP/Apps page and display a confirmation bubble
-  content::WebContents* contents = web_contents();
-  GURL url(source_ == SyncPromoUI::SOURCE_APPS_PAGE_LINK ?
-           chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
-  content::OpenURLParams params(url,
-                                content::Referrer(),
-                                CURRENT_TAB,
-                                content::PAGE_TRANSITION_AUTO_TOPLEVEL,
-                                false);
-  contents->OpenURL(params);
-}
-
 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;
   GURL page = SyncPromoUI::GetSyncPromoURL(source, false);
 
@@ skipping 99 matching lines @@
   // TODO(rogerta): Could we move this code back up to ShowInfoBarUIThread()?
   if (!error_message_.empty() && auto_accept_ == AUTO_ACCEPT_EXPLICIT) {
     VLOG(1) << "OneClickSigninHelper::DidStopLoading: error=" << error_message_;
     RemoveCurrentHistoryItem(contents);
     // After we redirect to NTP, our browser pointer gets corrupted because the
     // WebContents have changed, so grab the browser pointer
     // before the navigation.
     Browser* browser = chrome::FindBrowserWithWebContents(contents);
 
     // Redirect to the landing page and display an error popup.
-    RedirectToNtpOrAppsPage();
+    RedirectToNtpOrAppsPage(web_contents(), source_);
     ShowSigninErrorBubble(browser, error_message_);
     CleanTransientState();
     return;
   }
 
   if (AreWeShowingSignin(url, source_, email_)) {
     if (!showing_signin_) {
       if (source_ == SyncPromoUI::SOURCE_UNKNOWN)
         LogOneClickHistogramValue(one_click_signin::HISTOGRAM_SHOWN);
       else
@@ skipping 18 matching lines @@
   // If there is no valid email yet, there is nothing to do.  As of M26, the
   // password is allowed to be empty, since its no longer required to setup
   // sync.
   if (email_.empty()) {
     VLOG(1) << "OneClickSigninHelper::DidStopLoading: nothing to do";
     if (continue_url_match && auto_accept_ == AUTO_ACCEPT_EXPLICIT)
       RedirectToSignin();
     std::string unused_value;
     if (net::GetValueForKeyInQuery(url, "ntp", &unused_value)) {
       SyncPromoUI::SetUserSkippedSyncPromo(profile);
-      RedirectToNtpOrAppsPage();
+      RedirectToNtpOrAppsPage(web_contents(), source_);
     }
 
     if (!continue_url_match && !IsValidGaiaSigninRedirectOrResponseURL(url) &&
         ++untrusted_navigations_since_signin_visit_ > kMaxNavigationsSince) {
       CleanTransientState();
     }
 
     return;
   }
 
@@ skipping 118 matching lines @@
                               force_same_tab_navigation,
                               false /* confirmation_required */, source_),
                 contents,
                 start_mode));
       } else {
         StartSync(
             StartSyncArgs(profile, browser, auto_accept_, session_index_,
                           email_, password_, force_same_tab_navigation,
                           untrusted_confirmation_required_, source_),
             start_mode);
+
+        // If this explicit sign in is not from settings page/webstore, show
+        // the NTP/Apps page after sign in completes. In the case of the
+        // settings page, it will get closed by SyncSetupHandler. In the case
+        // of webstore, it will redirect back to webstore.
+        RedirectToNtpOrAppsPageIfNecessary(web_contents(), source_);

[bcwhite, 2013/06/11 15:57:02]

This is now a conditional call whereas before it it was always done (below)
regardless of which block of the condition was executed.

[fdoray, 2013/06/11 16:03:35]

If we go in the first code block, the StartExplicitSync callback will be
executed and RedirectToNtpOrAppsPageIfNecessary will be called in it (unless the
user clicks on the "Create a new user" button, but then we redirect to the
Settings page).

       }
 
       if (source_ == SyncPromoUI::SOURCE_SETTINGS &&
           SyncPromoUI::GetSourceForSyncPromoURL(continue_url_) ==
           SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
         redirect_url_ = continue_url_;
         ProfileSyncService* sync_service =
           ProfileSyncServiceFactory::GetForProfile(profile);
         if (sync_service)
           sync_service->AddObserver(this);
       }
-
-      // If this explicit sign in is not from settings page/webstore, show the
-      // NTP/Apps page after sign in completes. In the case of the settings
-      // page, it will get closed by SyncSetupHandler. In the case of webstore,
-      // it will redirect back to webstore.
-      if (source_ != SyncPromoUI::SOURCE_SETTINGS &&
-          source_ != SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
-        RedirectToNtpOrAppsPage();
-      }
       break;
     }
     case AUTO_ACCEPT_REJECTED_FOR_PROFILE:
       AddEmailToOneClickRejectedList(profile, email_);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_REJECTED);
       break;
     default:
       NOTREACHED() << "Invalid auto_accept=" << auto_accept_;
       break;
   }
@@ skipping 21 matching lines @@
     contents->GetController().LoadURL(redirect_url_,
                                       content::Referrer(),
                                       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                       std::string());
   }
 
   // Clear the redirect URL.
   redirect_url_ = GURL();
   sync_service->RemoveObserver(this);
 }