Sync Promo: Close browser tab when closing promo

chrome/browser/ui/webui/sync_promo_handler.cc

 // Copyright (c) 2011 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_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/sync_promo_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
 
 SyncPromoHandler::SyncPromoHandler(ProfileManager* profile_manager)
-    : SyncSetupHandler(profile_manager), window_already_closed_(false) {
+    : SyncSetupHandler(profile_manager),
+      window_already_closed_(false) {
 }
 
 SyncPromoHandler::~SyncPromoHandler() {
 }
 
 // static
 void SyncPromoHandler::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kSyncPromoViewCount, 0,
       PrefService::UNSYNCABLE_PREF);
 }
@@ skipping 79 matching lines @@
 }
 
 void SyncPromoHandler::ShowSetupUI() {
   ProfileSyncService* service =
       Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   service->get_wizard().Step(SyncSetupWizard::GetLoginState());
 }
 
 void SyncPromoHandler::HandleCloseSyncPromo(const base::ListValue* args) {
   CloseSyncSetup();
-  web_ui_->tab_contents()->OpenURL(GURL(chrome::kChromeUINewTabURL),
-                                   GURL(), CURRENT_TAB,
-                                   PageTransition::LINK);
+
+  // If there's no previous page on this tab then it means that the promo was
+  // displayed at startup. In this case we want to close the browser tab that
+  // the promo is in.
+  if (!web_ui_->tab_contents()->controller().CanGoBack()) {
+    Browser* browser =
+        BrowserList::FindBrowserWithTabContents(web_ui_->tab_contents());
+    browser->CloseTabContents(web_ui_->tab_contents());
+  } else {
+    web_ui_->tab_contents()->OpenURL(GURL(chrome::kChromeUINewTabURL),
+                                     GURL(), CURRENT_TAB,
+                                     PageTransition::LINK);
+  }
 }
 
 void SyncPromoHandler::HandleInitializeSyncPromo(const base::ListValue* args) {
   OpenSyncSetup();
   // We don't need to compute anything for this, just do this every time.
   RecordUserFlowAction(extension_misc::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).
   IncrementViewCountBy(1);
   // Record +1 for every view.  This is the only thing we record that's not part
@@ skipping 36 matching lines @@
   int adjusted = GetViewCount() + amount;
   prefs_->SetInteger(prefs::kSyncPromoViewCount, adjusted);
   return adjusted;
 }
 
 void SyncPromoHandler::RecordUserFlowAction(int action) {
   // Send an enumeration to our single user flow histogram.
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             extension_misc::SYNC_PROMO_BUCKET_BOUNDARY);
 }