Creates BrowserTabStripTracker to consolidate common code

chrome/browser/ui/ash/launcher/browser_status_monitor.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/ui/ash/launcher/browser_status_monitor.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 86 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SettingsWindowObserver);
 };
 
 BrowserStatusMonitor::BrowserStatusMonitor(
     ChromeLauncherController* launcher_controller)
     : launcher_controller_(launcher_controller),
       observed_activation_clients_(this),
       observed_root_windows_(this),
-      settings_window_observer_(new SettingsWindowObserver) {
+      settings_window_observer_(new SettingsWindowObserver),
+      browser_tab_strip_tracker_(this, this, this) {
   DCHECK(launcher_controller_);
-  BrowserList::AddObserver(this);
+
   chrome::SettingsWindowManager::GetInstance()->AddObserver(
       settings_window_observer_.get());
 
   // This check needs for win7_aura. Without this, all tests in
   // ChromeLauncherController will fail in win7_aura.
   if (ash::Shell::HasInstance()) {
     // We can't assume all RootWindows have the same ActivationClient.
     // Add a RootWindow and its ActivationClient to the observed list.
     aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
     aura::Window::Windows::const_iterator iter = root_windows.begin();
     for (; iter != root_windows.end(); ++iter) {
       // |observed_activation_clients_| can have the same activation client
       // multiple times - which would be handled by the used
       // |ScopedObserverWithDuplicatedSources|.
       observed_activation_clients_.Add(
           aura::client::GetActivationClient(*iter));
       observed_root_windows_.Add(static_cast<aura::Window*>(*iter));
     }
     ash::Shell::GetInstance()->GetScreen()->AddObserver(this);
   }
+
+  browser_tab_strip_tracker_.Init(
+      BrowserTabStripTracker::InitWith::ALL_BROWERS);
 }
 
 BrowserStatusMonitor::~BrowserStatusMonitor() {
   // This check needs for win7_aura. Without this, all tests in
   // ChromeLauncherController will fail in win7_aura.
   if (ash::Shell::HasInstance())
     ash::Shell::GetInstance()->GetScreen()->RemoveObserver(this);
 
   chrome::SettingsWindowManager::GetInstance()->RemoveObserver(
       settings_window_observer_.get());
 
-  BrowserList::RemoveObserver(this);
-
-  BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
-  for (BrowserList::const_iterator i = browser_list->begin();
-       i != browser_list->end(); ++i) {
-    OnBrowserRemoved(*i);
-  }
+  browser_tab_strip_tracker_.StopObservingAndSendOnBrowserRemoved();
 
   STLDeleteContainerPairSecondPointers(webcontents_to_observer_map_.begin(),
                                        webcontents_to_observer_map_.end());
 }
 
 void BrowserStatusMonitor::UpdateAppItemState(
     content::WebContents* contents,
     ChromeLauncherController::AppState app_state) {
   DCHECK(contents);
   // It is possible to come here from Browser::SwapTabContent where the contents
@@ skipping 45 matching lines @@
     UpdateBrowserItemState();
 }
 
 void BrowserStatusMonitor::OnWindowDestroyed(aura::Window* window) {
   // Remove RootWindow and its ActivationClient from observed list.
   observed_root_windows_.Remove(window);
   observed_activation_clients_.Remove(
       aura::client::GetActivationClient(window));
 }
 
+bool BrowserStatusMonitor::ShouldTrackBrowser(Browser* browser) {
+  return browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH;
+}
+
 void BrowserStatusMonitor::OnBrowserAdded(Browser* browser) {
-  if (browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
-    return;
-
   if (browser->is_type_popup() && browser->is_app()) {
     // Note: A V1 application will set the tab strip observer when the app gets
     // added to the shelf. This makes sure that in the multi user case we will
     // only set the observer while the app item exists in the shelf.
     AddV1AppToShelf(browser);
-  } else {
-    browser->tab_strip_model()->AddObserver(this);
   }
 }
 
 void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) {
-  if (browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
-    return;
-
   if (browser->is_type_popup() && browser->is_app())
     RemoveV1AppFromShelf(browser);
-  else
-    browser->tab_strip_model()->RemoveObserver(this);
 
   UpdateBrowserItemState();
 }
 
 void BrowserStatusMonitor::OnDisplayAdded(const gfx::Display& new_display) {
   // Add a new RootWindow and its ActivationClient to observed list.
   aura::Window* root_window = ash::Shell::GetInstance()
                                   ->window_tree_host_manager()
                                   ->GetRootWindowForDisplayId(new_display.id());
   // When the primary root window's display get removed, the existing root
@@ skipping 96 matching lines @@
 
 void BrowserStatusMonitor::WebContentsDestroyed(
     content::WebContents* contents) {
   UpdateAppItemState(contents, ChromeLauncherController::APP_STATE_REMOVED);
   RemoveWebContentsObserver(contents);
 }
 
 void BrowserStatusMonitor::AddV1AppToShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
 
-  browser->tab_strip_model()->AddObserver(this);
-
   std::string app_id =
       web_app::GetExtensionIdFromApplicationName(browser->app_name());
   if (!app_id.empty()) {
     browser_to_app_id_map_[browser] = app_id;
     launcher_controller_->LockV1AppWithID(app_id);
   }
 }
 
 void BrowserStatusMonitor::RemoveV1AppFromShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
 
-  browser->tab_strip_model()->RemoveObserver(this);
-
   if (browser_to_app_id_map_.find(browser) != browser_to_app_id_map_.end()) {
     launcher_controller_->UnlockV1AppWithID(browser_to_app_id_map_[browser]);
     browser_to_app_id_map_.erase(browser);
   }
 }
 
 bool BrowserStatusMonitor::IsV1AppInShelf(Browser* browser) {
   return browser_to_app_id_map_.find(browser) != browser_to_app_id_map_.end();
 }
 
@@ skipping 18 matching lines @@
     content::WebContents* contents) {
   return launcher_controller_->GetShelfIDForWebContents(contents);
 }
 
 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       SetShelfIDForBrowserWindowContents(browser, web_contents);
 }