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>
 
 #include "base/bind.h"
-#include "base/callback_forward.h"
+#include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
 #include "base/supports_user_data.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 214 matching lines @@
       NOTREACHED() << "Invalid auto_accept: " << args.auto_accept;
       break;
   }
   if (action != one_click_signin::HISTOGRAM_MAX)
     LogOneClickHistogramValue(action);
 }
 
 void StartExplicitSync(const StartSyncArgs& args,
                        content::WebContents* contents,
                        OneClickSigninSyncStarter::StartSyncMode start_mode,
+                       base::Closure start_sync_callback,
                        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);
+    start_sync_callback.Run();
   }
 }
 
 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 642 matching lines @@
   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::RedirectToNtpOrAppsPageIfNecessary() {
+  if (source_ != SyncPromoUI::SOURCE_SETTINGS &&
+      source_ != SyncPromoUI::SOURCE_WEBSTORE_INSTALL)
+    RedirectToNtpOrAppsPage();

[Roger Tawa OOO till Jul 10th, 2013/06/05 23:48:37]

Add { and } for if statement.

[fdoray, 2013/06/10 15:44:13]

Done.

+}
+
 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(GURL(), source, false);
 
@@ skipping 240 matching lines @@
     case AUTO_ACCEPT_EXPLICIT: {
       if (switched_to_advanced_) {
         LogHistogramValue(original_source_,
                           one_click_signin::HISTOGRAM_WITH_ADVANCED);
         LogHistogramValue(original_source_,
                           one_click_signin::HISTOGRAM_ACCEPTED);
       } else {
         LogHistogramValue(source_, one_click_signin::HISTOGRAM_ACCEPTED);
         LogHistogramValue(source_, one_click_signin::HISTOGRAM_WITH_DEFAULTS);
       }
+
+      // Remove the blank page from the history of the current tab. It's not
+      // necessary to do this if the sign in is from the Settings page /
+      // Webstore because the current tab will be closed after sign in
+      // completes.
+      if (source_ != SyncPromoUI::SOURCE_SETTINGS &&
+          source_ != SyncPromoUI::SOURCE_WEBSTORE_INSTALL)
+        RemoveCurrentHistoryItem(contents);
+
       OneClickSigninSyncStarter::StartSyncMode start_mode =
           source_ == SyncPromoUI::SOURCE_SETTINGS ?
               OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST :
               OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
 
       std::string last_email =
           profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
 
       if (!last_email.empty() && !gaia::AreEmailsSame(last_email, email_)) {
         // If the new email address is different from the email address that
         // just signed in, show a confirmation dialog.
 
         // No need to display a second confirmation so pass false below.
         // TODO(atwilson): Move this into OneClickSigninSyncStarter.
         ConfirmEmailDialogDelegate::AskForConfirmation(
             contents,
             last_email,
             email_,
             base::Bind(
                 &StartExplicitSync,
                 StartSyncArgs(profile, browser, auto_accept_,
                               session_index_, email_, password_,
                               force_same_tab_navigation,
                               false /* confirmation_required */, source_),
                 contents,
-                start_mode));
+                start_mode,
+                base::Bind(
+                    &OneClickSigninHelper::RedirectToNtpOrAppsPageIfNecessary,
+                    base::Unretained(this))));
       } 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();
       }
 
       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) {
-        RemoveCurrentHistoryItem(contents);
-        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);
 }