Creates BrowserTabStripTracker to consolidate common code

chrome/browser/extensions/api/tabs/tabs_event_router.cc

 // Copyright 2013 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/extensions/api/tabs/tabs_event_router.h"
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 100 matching lines @@
 }
 
 bool TabsEventRouter::TabEntry::SetMuted(bool new_val) {
   if (was_muted_ == new_val)
     return false;
   was_muted_ = new_val;
   return true;
 }
 
 TabsEventRouter::TabsEventRouter(Profile* profile)
-    : profile_(profile), favicon_scoped_observer_(this) {
+    : profile_(profile),
+      favicon_scoped_observer_(this),
+      browser_tab_strip_tracker_(this, this, this) {
   DCHECK(!profile->IsOffTheRecord());
 
-  BrowserList::AddObserver(this);
-
-  // Init() can happen after the browser is running, so catch up with any
-  // windows that already exist.
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    RegisterForBrowserNotifications(*it);
-
-    // Also catch up our internal bookkeeping of tab entries.
-    Browser* browser = *it;
-    if (ExtensionTabUtil::BrowserSupportsTabs(browser)) {
-      for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
-        WebContents* contents = browser->tab_strip_model()->GetWebContentsAt(i);
-        int tab_id = ExtensionTabUtil::GetTabId(contents);
-        tab_entries_[tab_id] = make_linked_ptr(new TabEntry(contents));
-      }
-    }
-  }
+  browser_tab_strip_tracker_.Init(
+      BrowserTabStripTracker::InitWith::ALL_BROWERS);
 }
 
 TabsEventRouter::~TabsEventRouter() {
-  BrowserList::RemoveObserver(this);
 }
 
-void TabsEventRouter::OnBrowserAdded(Browser* browser) {
-  RegisterForBrowserNotifications(browser);
-}
-
-void TabsEventRouter::RegisterForBrowserNotifications(Browser* browser) {
-  if (!profile_->IsSameProfile(browser->profile()) ||
-      !ExtensionTabUtil::BrowserSupportsTabs(browser))
-    return;
-  // Start listening to TabStripModel events for this browser.
-  TabStripModel* tab_strip = browser->tab_strip_model();
-  tab_strip->AddObserver(this);
-
-  for (int i = 0; i < tab_strip->count(); ++i) {
-    RegisterForTabNotifications(tab_strip->GetWebContentsAt(i));
-  }
+bool TabsEventRouter::ShouldTrackBrowser(Browser* browser) {
+  return profile_->IsSameProfile(browser->profile()) &&
+         ExtensionTabUtil::BrowserSupportsTabs(browser);
 }
 
 void TabsEventRouter::RegisterForTabNotifications(WebContents* contents) {
   registrar_.Add(
       this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&contents->GetController()));
 
   // Observing NOTIFICATION_WEB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
   // ever having been re-attached and closed. This happens in the case of
@@ skipping 11 matching lines @@
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&contents->GetController()));
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::Source<WebContents>(contents));
   favicon_scoped_observer_.Remove(
       favicon::ContentFaviconDriver::FromWebContents(contents));
 
   ZoomController::FromWebContents(contents)->RemoveObserver(this);
 }
 
-void TabsEventRouter::OnBrowserRemoved(Browser* browser) {
-  if (!profile_->IsSameProfile(browser->profile()))
-    return;
-
-  // Stop listening to TabStripModel events for this browser.
-  browser->tab_strip_model()->RemoveObserver(this);
-}
-
 void TabsEventRouter::OnBrowserSetLastActive(Browser* browser) {
   TabsWindowsAPI* tabs_window_api = TabsWindowsAPI::Get(profile_);
   if (tabs_window_api) {
     tabs_window_api->windows_event_router()->OnActiveWindowChanged(
         browser ? browser->extension_window_controller() : NULL);
   }
 }
 
 static bool WillDispatchTabCreatedEvent(
     WebContents* contents,
@@ skipping 22 matching lines @@
   event->will_dispatch_callback =
       base::Bind(&WillDispatchTabCreatedEvent, contents, active);
   EventRouter::Get(profile)->BroadcastEvent(event.Pass());
 
   RegisterForTabNotifications(contents);
 }
 
 void TabsEventRouter::TabInsertedAt(WebContents* contents,
                                     int index,
                                     bool active) {
-  // If tab is new, send created event.
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   if (GetTabEntry(contents).get() == NULL) {
     tab_entries_[tab_id] = make_linked_ptr(new TabEntry(contents));
 
-    TabCreatedAt(contents, index, active);
+    // We've never seen this tab, send create event as long as we're not in the
+    // constructor.
+    if (browser_tab_strip_tracker_.is_processing_initial_browsers())
+      RegisterForTabNotifications(contents);
+    else
+      TabCreatedAt(contents, index, active);
     return;
   }
 
   scoped_ptr<base::ListValue> args(new base::ListValue);
   args->Append(new FundamentalValue(tab_id));
 
   base::DictionaryValue* object_args = new base::DictionaryValue();
   object_args->Set(tabs_constants::kNewWindowIdKey,
                    new FundamentalValue(
                        ExtensionTabUtil::GetWindowIdOfTab(contents)));
@@ skipping 348 matching lines @@
 void TabsEventRouter::OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
                                        bool icon_url_changed) {
   if (icon_url_changed) {
     favicon::ContentFaviconDriver* content_favicon_driver =
         static_cast<favicon::ContentFaviconDriver*>(favicon_driver);
     FaviconUrlUpdated(content_favicon_driver->web_contents());
   }
 }
 
 }  // namespace extensions