Change the navigation code of sync promo slightly to navigate

chrome/browser/ui/webui/sync_promo/sync_promo_handler.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/webui/sync_promo/sync_promo_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 171 matching lines @@
 
 void SyncPromoHandler::HandleCloseSyncPromo(const base::ListValue* args) {
   CloseSyncSetup();
 
   // If the user has signed in then set the pref to show them NTP bubble
   // confirming that they're signed in.
   std::string username = prefs_->GetString(prefs::kGoogleServicesUsername);
   if (!username.empty())
     prefs_->SetBoolean(prefs::kSyncPromoShowNTPBubble, true);
 
-  // If the browser window is being closed then don't try to navigate to another
-  // URL. This prevents the browser window from flashing during close.
+  // If the browser window is being closed then don't try to navigate to
+  // another URL. This prevents the browser window from flashing during
+  // close.
   Browser* browser =
       browser::FindBrowserWithWebContents(web_ui()->GetWebContents());
   if (!browser || !browser->IsAttemptingToCloseBrowser()) {
-    GURL url = SyncPromoUI::GetNextPageURLForSyncPromoURL(
-        web_ui()->GetWebContents()->GetURL());
-    OpenURLParams params(
-        url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK, false);
-    web_ui()->GetWebContents()->OpenURL(params);
+    // Close the window if it was opened in auto-close mode.
+    const GURL& sync_url = web_ui()->GetWebContents()->GetURL();
+    if (SyncPromoUI::GetAutoCloseForSyncPromoURL(sync_url)) {
+      web_ui()->GetWebContents()->Close();
+    } else {
+      GURL url = SyncPromoUI::GetNextPageURLForSyncPromoURL(sync_url);
+      OpenURLParams params(
+          url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK, false);
+      web_ui()->GetWebContents()->OpenURL(params);
+    }
   }
 }
 
 void SyncPromoHandler::HandleInitializeSyncPromo(const base::ListValue* args) {
   // Open the sync wizard to the login screen.
   OpenSyncSetup(true);
   // We don't need to compute anything for this, just do this every time.
   RecordUserFlowAction(SYNC_PROMO_VIEWED);
   // Increment view count first and show natural numbers in stats rather than 0
   // based starting point (if it happened to be our first time showing this).
@@ skipping 62 matching lines @@
   // Send an enumeration to our single user flow histogram.
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             SYNC_PROMO_BUCKET_BOUNDARY);
 }
 
 void SyncPromoHandler::CloseUI() {
   // Callers should not ever try to close the promo UI (should only call
   // CloseUI() if the user is already logged in).
   NOTREACHED() << "Cannot close the promo UI";
 }