Display confirmation dialog for untrusted signins

chrome/browser/ui/sync/one_click_signin_sync_starter.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_sync_starter.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 
@@ skipping 30 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 
 OneClickSigninSyncStarter::OneClickSigninSyncStarter(
     Profile* profile,
     Browser* browser,
     const std::string& session_index,
     const std::string& email,
     const std::string& password,
     StartSyncMode start_mode,
     bool force_same_tab_navigation,
-    ConfirmationRequired confirmation_required)
+    ConfirmationRequired confirmation_required,
+    SyncPromoUI::Source source)
     : start_mode_(start_mode),
       force_same_tab_navigation_(force_same_tab_navigation),
       confirmation_required_(confirmation_required),
+      source_(source),
       weak_pointer_factory_(this) {
   DCHECK(profile);
   BrowserList::AddObserver(this);
 
   Initialize(profile, browser);
 
   // Start the signin process using the cookies in the cookie jar.
   SigninManager* manager = SigninManagerFactory::GetForProfile(profile_);
   SigninManager::OAuthTokenFetchedCallback callback;
   // Policy is enabled, so pass in a callback to do extra policy-related UI
@@ skipping 240 matching lines @@
   } else {
     // No confirmation required - just sign in the user.
     signin->CompletePendingSignin();
   }
 }
 
 void OneClickSigninSyncStarter::UntrustedSigninConfirmed(
     StartSyncMode response) {
   if (response == UNDO_SYNC) {
     CancelSigninAndDelete();
+    // If this was not an interstitial signin, (i.e. it was a SAML signin)
+    // then the browser page is now blank and should redirect to the NTP.
+    if (source_ != SyncPromoUI::SOURCE_UNKNOWN) {
+      chrome::NavigateParams params(browser_, GURL(chrome::kChromeUINewTabURL),

[Roger Tawa OOO till Jul 10th, 2013/06/21 17:06:22]

I wonder if you should call EnsureBrowser() here, like is done at line 387
below.  This could happen if the user closes the browser window before the
starter is done.

[noms (inactive), 2013/06/21 17:21:20]

Done.

+                                    content::PAGE_TRANSITION_AUTO_TOPLEVEL);
+      params.disposition = CURRENT_TAB;
+      params.window_action = chrome::NavigateParams::SHOW_WINDOW;
+      chrome::Navigate(&params);
+    }
   } else {
     // If the user clicked the "Advanced" link in the confirmation dialog, then
     // override the current start_mode_ to bring up the advanced sync settings.
     if (response == CONFIGURE_SYNC_FIRST)
       start_mode_ = response;
     SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
     signin->CompletePendingSignin();
   }
 }
 
@@ skipping 114 matching lines @@
 
 void OneClickSigninSyncStarter::ShowSyncSettingsPageOnSameTab() {
   std::string url = std::string(chrome::kChromeUISettingsURL) +
       chrome::kSyncSetupSubPage;
   chrome::NavigateParams params(
       browser_, GURL(url), content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   params.disposition = CURRENT_TAB;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
 }