Second try for

chrome/browser/ui/views/ash/launcher/launcher_updater.cc

 // Copyright (c) 2012 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/views/ash/launcher/launcher_updater.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 45 matching lines @@
   if (type_ == TYPE_PANEL) {
     favicon_loader_.reset(
         new LauncherFaviconLoader(
             this, tab_model_->GetActiveTabContents()->web_contents()));
   }
   if (type_ == TYPE_APP || type_ == TYPE_PANEL) {
     // App type never changes, create the launcher item immediately.
     ChromeLauncherDelegate::AppType app_type =
         type_ == TYPE_PANEL ? ChromeLauncherDelegate::APP_TYPE_PANEL
         : ChromeLauncherDelegate::APP_TYPE_WINDOW;
+    ash::LauncherItemStatus app_status =
+        ash::wm::IsActiveWindow(window_) ?
+            ash::STATUS_ACTIVE : ash::STATUS_RUNNING;
     item_id_ = launcher_delegate_->CreateAppLauncherItem(
-        this, app_id_, app_type, ash::STATUS_RUNNING);
+        this, app_id_, app_type, app_status);
   } else {
     // Determine if we have any tabs that should get launcher items.
     std::vector<TabContentsWrapper*> app_tabs;
     for (int i = 0; i < tab_model_->count(); ++i) {
       TabContentsWrapper* tab = tab_model_->GetTabContentsAt(i);
       if (!launcher_delegate_->GetAppID(tab).empty())
         app_tabs.push_back(tab);
     }
 
     if (static_cast<int>(app_tabs.size()) != tab_model_->count())
       CreateTabbedItem();
 
     // Create items for the app tabs.
     for (size_t i = 0; i < app_tabs.size(); ++i)
       AddAppItem(app_tabs[i]);
   }
-  UpdateLauncher(tab_model_->GetActiveTabContents());
+  // In testing scenarios we can get tab strips with no active contents.
+  if (tab_model_->GetActiveTabContents())
+    UpdateLauncher(tab_model_->GetActiveTabContents());
 }
 
 // static
 LauncherUpdater* LauncherUpdater::Create(Browser* browser) {
   Type type;
   std::string app_id;
   if (browser->type() == Browser::TYPE_TABBED) {
     type = TYPE_TABBED;
   } else if (browser->is_app()) {
     type = browser->is_type_panel() ? TYPE_PANEL : TYPE_APP;
@@ skipping 10 matching lines @@
 
 TabContentsWrapper* LauncherUpdater::GetTab(ash::LauncherID id) {
   for (AppTabMap::const_iterator i = app_map_.begin(); i != app_map_.end();
        ++i) {
     if (i->second.id == id)
       return i->first;
   }
   return NULL;
 }
 
+void LauncherUpdater::BrowserActivationStateChanged() {
+  // This can happen in tests.
+  if (type_ == TYPE_TABBED && tab_model_->GetActiveTabContents() == NULL)
+    return;
+
+  launcher_delegate_->SetItemStatus(
+      GetLauncherID(tab_model_->GetActiveTabContents()),
+      ash::wm::IsActiveWindow(window_) ?
+          ash::STATUS_ACTIVE : ash::STATUS_RUNNING);
+}
+
 void LauncherUpdater::ActiveTabChanged(TabContentsWrapper* old_contents,
                                        TabContentsWrapper* new_contents,
                                        int index,
                                        bool user_gesture) {
+  if (ash::wm::IsActiveWindow(window_)) {
+    ash::LauncherID old_id = GetLauncherID(old_contents);
+    ash::LauncherID new_id = GetLauncherID(new_contents);
+
+    // The new_contents state will be handled in UpdateLauncher().
+    if (old_id != new_id && old_id >= 0)
+      launcher_delegate_->SetItemStatus(old_id, ash::STATUS_RUNNING);
+  }
   // Update immediately on a tab change.
   UpdateLauncher(new_contents);
 }
 
 void LauncherUpdater::TabChangedAt(
     TabContentsWrapper* tab,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   if (type_ == TYPE_TABBED &&
       (change_type == TabStripModelObserver::LOADING_ONLY ||
@@ skipping 69 matching lines @@
       launcher_model()->Set(item_index, new_item);
     }
   }
 }
 
 void LauncherUpdater::FaviconUpdated() {
   UpdateLauncher(tab_model_->GetActiveTabContents());
 }
 
 void LauncherUpdater::UpdateLauncher(TabContentsWrapper* tab) {
+  if (!tab)
+    return;  // Assume the window is going to be closed if there are no tabs.
+
+  launcher_delegate_->SetItemStatus(GetLauncherID(tab), GetStatusForTab(tab));
+
   if (type_ == TYPE_APP)
     return;  // TYPE_APP is entirely maintained by ChromeLauncherDelegate.
 
-  if (!tab)
-    return;  // Assume the window is going to be closed if there are no tabs.
-
   int item_index = launcher_model()->ItemIndexByID(item_id_);
   if (item_index == -1)
     return;
 
   ash::LauncherItem item = launcher_model()->items()[item_index];
   if (type_ == TYPE_PANEL) {
     // Update the icon for app panels.
     item.image = favicon_loader_->GetFavicon();
     if (item.image.empty()) {
       if (tab->extension_tab_helper()->GetExtensionAppIcon())
@@ skipping 87 matching lines @@
         // app item, which will end up using the closed item.
         launcher_delegate_->LauncherItemClosed(item_id_);
         AddAppItem(tab);
       } else {
         // All the tabs are app tabs, replace the tabbed item with the app.
         launcher_delegate_->ConvertTabbedToApp(
             item_id_,
             launcher_delegate_->GetAppID(tab),
             ChromeLauncherDelegate::APP_TYPE_TAB);
         RegisterAppItem(item_id_, tab);
-        launcher_delegate_->SetItemStatus(item_id_, ash::STATUS_RUNNING);
+        launcher_delegate_->SetItemStatus(item_id_, GetStatusForTab(tab));
       }
       item_id_ = -1;
     } else {
       AddAppItem(tab);
     }
   }
 }
 
 void LauncherUpdater::AddAppItem(TabContentsWrapper* tab) {
+  ash::LauncherItemStatus status = GetStatusForTab(tab);
   ash::LauncherID id = launcher_delegate_->CreateAppLauncherItem(
       this,
       launcher_delegate_->GetAppID(tab),
       ChromeLauncherDelegate::APP_TYPE_TAB,
-      ash::STATUS_RUNNING);
+      status);
   RegisterAppItem(id, tab);
 }
 
 void LauncherUpdater::RegisterAppItem(ash::LauncherID id,
                                       TabContentsWrapper* tab) {
   AppTabDetails details;
   details.id = id;
   details.app_id = launcher_delegate_->GetAppID(tab);
   app_map_[tab] = details;
 }
@@ skipping 12 matching lines @@
   for (AppTabMap::const_iterator i = app_map_.begin(); i != app_map_.end();
        ++i) {
     if (i->second.id == id) {
       *tab = i->first;
       return true;
     }
   }
   return false;
 }
 
+ash::LauncherID LauncherUpdater::GetLauncherID(TabContentsWrapper* tab) {
+  if (type_ == TYPE_APP || type_ == TYPE_PANEL)
+    return item_id_;
+  AppTabMap::iterator i = app_map_.find(tab);
+  if (i == app_map_.end())
+    return item_id_;
+  return i->second.id;
+}
+
+ash::LauncherItemStatus LauncherUpdater::GetStatusForTab(
+    TabContentsWrapper* tab) {
+  return ash::wm::IsActiveWindow(window_) &&
+      tab == tab_model_->GetActiveTabContents() ?
+        ash::STATUS_ACTIVE : ash::STATUS_RUNNING;
+}
+
 ash::LauncherModel* LauncherUpdater::launcher_model() {
   return launcher_delegate_->model();
 }