Remove ash::ScopedObserverWithDuplicatedSources

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"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/settings_window_manager_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "grit/ash_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/display/screen.h"
 #include "ui/wm/public/activation_client.h"
 
 // This class monitors the WebContent of the all tab and notifies a navigation
 // to the BrowserStatusMonitor.
 class BrowserStatusMonitor::LocalWebContentsObserver
     : public content::WebContentsObserver {
  public:
   LocalWebContentsObserver(content::WebContents* contents,
                            BrowserStatusMonitor* monitor)
       : content::WebContentsObserver(contents),
@@ skipping 55 matching lines @@
         l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
   }
 
  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),
       browser_tab_strip_tracker_(this, this, this) {
   DCHECK(launcher_controller_);
 
   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));
-    }
-    display::Screen::GetScreen()->AddObserver(this);
-  }
+  ash::Shell::GetInstance()->activation_client()->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())
-    display::Screen::GetScreen()->RemoveObserver(this);
-
+  ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
   chrome::SettingsWindowManager::GetInstance()->RemoveObserver(
       settings_window_observer_.get());
 
   browser_tab_strip_tracker_.StopObservingAndSendOnBrowserRemoved();
 
   STLDeleteContainerPairSecondPointers(webcontents_to_observer_map_.begin(),
                                        webcontents_to_observer_map_.end());
 }
 
 void BrowserStatusMonitor::UpdateAppItemState(
@@ skipping 42 matching lines @@
       UpdateAppItemState(
           contents_from_gained,
           ChromeLauncherController::APP_STATE_WINDOW_ACTIVE);
     }
   }
 
   if (contents_from_lost || contents_from_gained)
     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 true;
 }
 
 void BrowserStatusMonitor::OnBrowserAdded(Browser* browser) {
   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);
   }
 }
 
 void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) {
   if (browser->is_type_popup() && browser->is_app())
     RemoveV1AppFromShelf(browser);
 
   UpdateBrowserItemState();
 }
 
-void BrowserStatusMonitor::OnDisplayAdded(const display::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
-  // window is taken over by the new display and the observer is already set.
-  if (!observed_root_windows_.IsObserving(root_window)) {
-    observed_root_windows_.Add(static_cast<aura::Window*>(root_window));
-    observed_activation_clients_.Add(
-        aura::client::GetActivationClient(root_window));
-  }
-}
-
-void BrowserStatusMonitor::OnDisplayRemoved(
-    const display::Display& old_display) {
-  // When this is called, RootWindow of |old_display| is already removed.
-  // Instead, we can remove RootWindow and its ActivationClient in the
-  // OnWindowRemoved().
-  // Do nothing here.
-}
-
-void BrowserStatusMonitor::OnDisplayMetricsChanged(const display::Display&,
-                                                   uint32_t) {
-  // Do nothing here.
-}
-
 void BrowserStatusMonitor::ActiveTabChanged(content::WebContents* old_contents,
                                             content::WebContents* new_contents,
                                             int index,
                                             int reason) {
   Browser* browser = NULL;
   // Use |new_contents|. |old_contents| could be NULL.
   DCHECK(new_contents);
   browser = chrome::FindBrowserWithWebContents(new_contents);
 
   ChromeLauncherController::AppState state =
@@ skipping 109 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);
 }