Handling browser item status in BrowserShortcutLauncherItemController

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/shell.h"
 #include "ash/wm/window_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/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/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 39 matching lines @@
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
 
   browser_list->RemoveObserver(this);
 }
 
 void BrowserStatusMonitor::OnWindowActivated(aura::Window* gained_active,
                                              aura::Window* lost_active) {
   Browser* browser = chrome::FindBrowserWithWindow(lost_active);
-  content::WebContents* active_contents = NULL;
-
   if (browser) {
-    active_contents = browser->tab_strip_model()->GetActiveWebContents();
-    if (active_contents)
-      UpdateAppState(active_contents);
+    UpdateAppAndBrowserState(
+        browser->tab_strip_model()->GetActiveWebContents());
   }
 
   browser = chrome::FindBrowserWithWindow(gained_active);
   if (browser) {
-    active_contents = browser->tab_strip_model()->GetActiveWebContents();
-    if (active_contents)
-      UpdateAppState(active_contents);
+    UpdateAppAndBrowserState(
+        browser->tab_strip_model()->GetActiveWebContents());
   }
 }
 
 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(
       static_cast<aura::RootWindow*>(window)));
 }
 
@@ skipping 10 matching lines @@
   }
 }
 
 void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) {
   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);
   }
-  launcher_controller_->UpdateBrowserItemStatus();
+  UpdateBrowserItemState();
 }
 
 void BrowserStatusMonitor::OnDisplayBoundsChanged(
     const gfx::Display& display) {
   // Do nothing here.
 }
 
 void BrowserStatusMonitor::OnDisplayAdded(const gfx::Display& new_display) {
   // Add a new RootWindow and its ActivationClient to observed list.
   aura::RootWindow* root_window = ash::Shell::GetInstance()->
@@ skipping 18 matching lines @@
                                             content::WebContents* new_contents,
                                             int index,
                                             int reason) {
   Browser* browser = NULL;
   if (old_contents)
     browser = chrome::FindBrowserWithWebContents(old_contents);
 
   // Update immediately on a tab change.
   if (browser &&
       (TabStripModel::kNoTab !=
-           browser->tab_strip_model()->GetIndexOfWebContents(old_contents)))
-    UpdateAppState(old_contents);
+           browser->tab_strip_model()->GetIndexOfWebContents(old_contents))) {
+    launcher_controller_->UpdateAppState(
+        old_contents,
+        ChromeLauncherController::APP_STATE_INACTIVE);
+  }
 
-  UpdateAppState(new_contents);
+  UpdateAppAndBrowserState(new_contents);
 }
 
 void BrowserStatusMonitor::TabInsertedAt(content::WebContents* contents,
                                          int index,
                                          bool foreground) {
-  UpdateAppState(contents);
+  UpdateAppAndBrowserState(contents);
 }
 
 void BrowserStatusMonitor::TabDetachedAt(content::WebContents* contents,
                                          int index) {
   launcher_controller_->UpdateAppState(
       contents, ChromeLauncherController::APP_STATE_REMOVED);
+  UpdateBrowserItemState();
 }
 
 void BrowserStatusMonitor::TabChangedAt(
     content::WebContents* contents,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
-  UpdateAppState(contents);
+  UpdateAppAndBrowserState(contents);
 }
 
 void BrowserStatusMonitor::TabReplacedAt(TabStripModel* tab_strip_model,
                                          content::WebContents* old_contents,
                                          content::WebContents* new_contents,
                                          int index) {
   launcher_controller_->UpdateAppState(
       old_contents,
       ChromeLauncherController::APP_STATE_REMOVED);
-  UpdateAppState(new_contents);
+  UpdateAppAndBrowserState(new_contents);
 }
 
-void BrowserStatusMonitor::UpdateAppState(content::WebContents* contents) {
-  if (!contents)
-    return;
+void BrowserStatusMonitor::UpdateAppAndBrowserState(
+    content::WebContents* contents) {
+  if (contents) {
+    ChromeLauncherController::AppState app_state =
+        ChromeLauncherController::APP_STATE_INACTIVE;
 
-  ChromeLauncherController::AppState app_state =
-      ChromeLauncherController::APP_STATE_INACTIVE;
+    Browser* browser = chrome::FindBrowserWithWebContents(contents);
+    if (browser->tab_strip_model()->GetActiveWebContents() == contents) {
+      if (browser->window()->IsActive())
+        app_state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
+      else
+        app_state = ChromeLauncherController::APP_STATE_ACTIVE;
+    }
 
-  Browser* browser = chrome::FindBrowserWithWebContents(contents);
-  if (browser->tab_strip_model()->GetActiveWebContents() == contents) {
-    if (browser->window()->IsActive())
-      app_state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
-    else
-      app_state = ChromeLauncherController::APP_STATE_ACTIVE;
+    launcher_controller_->UpdateAppState(contents, app_state);
   }
+  UpdateBrowserItemState();
+}
 
-  launcher_controller_->UpdateAppState(contents, app_state);
+void BrowserStatusMonitor::UpdateBrowserItemState() {
+  launcher_controller_->GetBrowserShortcutLauncherItemController()->
+      UpdateBrowserItemState();
 }