Sync Promo: Close browser tab when closing promo

chrome/browser/ui/webui/ntp/ntp_login_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/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 60 matching lines @@
 
   if (username.empty()) {
     // The user isn't signed in, show the sync promo.
     if (SyncPromoUI::ShouldShowSyncPromo(profile)) {
         web_ui_->tab_contents()->OpenURL(GURL(chrome::kChromeUISyncPromoURL),
                                          GURL(), CURRENT_TAB,
                                          PageTransition::LINK);
     }
   } else if (args->GetSize() == 4) {
     // The user is signed in, show the profiles menu.
-    Browser* browser = GetBrowser();
+    Browser* browser =
+        BrowserList::FindBrowserWithTabContents(web_ui_->tab_contents());
     if (!browser)
       return;
     double x = 0;
     double y = 0;
     double width = 0;
     double height = 0;
     bool success = args->GetDouble(0, &x);
     DCHECK(success);
     success = args->GetDouble(1, &y);
     DCHECK(success);
@@ skipping 36 matching lines @@
   // For now we don't care about showing sync status on Chrome OS. The promo
   // UI and the avatar menu don't exist on that platform.
   return false;
 #else
   if (profile->IsOffTheRecord())
     return false;
 
   return profile->GetOriginalProfile()->IsSyncAccessible();
 #endif
 }
-
-Browser* NTPLoginHandler::GetBrowser() {
-  for (TabContentsIterator it; !it.done(); ++it) {
-    TabContents* tab = it->tab_contents();
-    if (tab == web_ui_->tab_contents())
-      return it.browser();
-  }
-  return NULL;
-}