Handling browser item status in BrowserShortcutLauncherItemController

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
@@ skipping 330 matching lines @@
 void ChromeLauncherController::SetItemStatus(
     ash::LauncherID id,
     ash::LauncherItemStatus status) {
   int index = model_->ItemIndexByID(id);
   // Since ordinary browser windows are not registered, we might get a negative
   // index here.
   if (index >= 0) {
     ash::LauncherItem item = model_->items()[index];
     item.status = status;
     model_->Set(index, item);
-
-    if (model_->items()[index].type == ash::TYPE_BROWSER_SHORTCUT)
-      return;
   }
-  UpdateBrowserItemStatus();
 }
 
 void ChromeLauncherController::SetItemController(
     ash::LauncherID id,
     LauncherItemController* controller) {
   CHECK(controller);
   IDToItemControllerMap::iterator iter = id_to_item_controller_map_.find(id);
   CHECK(iter != id_to_item_controller_map_.end());
   iter->second->OnRemoved();
   iter->second = controller;
@@ skipping 446 matching lines @@
     app_id = kGmailAppId;
 
   // Check the old |app_id| for a tab. If the contents has changed we need to
   // remove it from the previous app.
   if (web_contents_to_app_id_.find(contents) != web_contents_to_app_id_.end()) {
     std::string last_app_id = web_contents_to_app_id_[contents];
     if (last_app_id != app_id)
       RemoveTabFromRunningApp(contents, last_app_id);
   }
 
-  if (app_id.empty()) {
-    // Even if there is no application running, we should update the activation
-    // state of the associated browser.
-    UpdateBrowserItemStatus();
-    return;
-  }
-
   web_contents_to_app_id_[contents] = app_id;
 
   if (app_state == APP_STATE_REMOVED) {
     // The tab has gone away.
     RemoveTabFromRunningApp(contents, app_id);
   } else {
     WebContentsList& tab_list(app_id_to_web_contents_list_[app_id]);
 
     if (app_state == APP_STATE_INACTIVE) {
       WebContentsList::const_iterator i_tab =
           std::find(tab_list.begin(), tab_list.end(), contents);
       if (i_tab == tab_list.end())
         tab_list.push_back(contents);
       if (i_tab != tab_list.begin()) {
         // Going inactive, but wasn't the front tab, indicating that a new
         // tab has already become active.
         return;
       }
     } else {
       tab_list.remove(contents);
       tab_list.push_front(contents);
     }
     ash::LauncherID id = GetLauncherIDForAppID(app_id);
     if (id) {
       // If the window is active, mark the app as active.
       SetItemStatus(id, app_state == APP_STATE_WINDOW_ACTIVE ?
           ash::STATUS_ACTIVE : ash::STATUS_RUNNING);
     }
   }
-  UpdateBrowserItemStatus();
 }
 
 void ChromeLauncherController::SetRefocusURLPatternForTest(ash::LauncherID id,
                                                            const GURL& url) {
   DCHECK(HasItemController(id));
   LauncherItemController* controller = id_to_item_controller_map_[id];
 
   int index = model_->ItemIndexByID(id);
   if (index == -1) {
     NOTREACHED() << "Invalid launcher id";
@@ skipping 360 matching lines @@
     const std::string& app_id,
     int index,
     ash::LauncherItemType launcher_item_type) {
   AppShortcutLauncherItemController* controller =
       new AppShortcutLauncherItemController(app_id, this);
   ash::LauncherID launcher_id = InsertAppLauncherItem(
       controller, app_id, ash::STATUS_CLOSED, index, launcher_item_type);
   return launcher_id;
 }
 
-void ChromeLauncherController::UpdateBrowserItemStatus() {
-  // This check needs for win7_aura. UpdateBrowserItemStatus() access Shell.
-  // Without this ChromeLauncherControllerTest.BrowserMenuGeneration test will
-  // fail.
-  if (!ash::Shell::HasInstance())
-    return;
-
-  // Determine the new browser's active state and change if necessary.
-  size_t browser_index = ash::launcher::GetBrowserItemIndex(*model_);
-  DCHECK_GE(browser_index, 0u);
-  ash::LauncherItem browser_item = model_->items()[browser_index];
-  ash::LauncherItemStatus browser_status = ash::STATUS_CLOSED;
-
-  aura::Window* window = ash::wm::GetActiveWindow();
-  if (window) {
-    // Check if the active browser / tab is a browser which is not an app,
-    // a windowed app, a popup or any other item which is not a browser of
-    // interest.
-    Browser* browser = chrome::FindBrowserWithWindow(window);
-    if (IsBrowserRepresentedInBrowserList(browser)) {
-      browser_status = ash::STATUS_ACTIVE;
-      const ash::LauncherItems& items = model_->items();
-      // If another launcher item has claimed to be active, we don't.
-      for (size_t i = 0;
-           i < items.size() && browser_status == ash::STATUS_ACTIVE; ++i) {
-        if (i != browser_index && items[i].status == ash::STATUS_ACTIVE)
-          browser_status = ash::STATUS_RUNNING;
-      }
-    }
-  }
-
-  if (browser_status == ash::STATUS_CLOSED) {
-    const BrowserList* ash_browser_list =
-        BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
-    for (BrowserList::const_reverse_iterator it =
-             ash_browser_list->begin_last_active();
-         it != ash_browser_list->end_last_active() &&
-         browser_status == ash::STATUS_CLOSED; ++it) {
-      if (IsBrowserRepresentedInBrowserList(*it))
-        browser_status = ash::STATUS_RUNNING;
-    }
-  }
-
-  if (browser_status != browser_item.status) {
-    browser_item.status = browser_status;
-    model_->Set(browser_index, browser_item);
-  }
-}
-
 Profile* ChromeLauncherController::GetProfileForNewWindows() {
   return ProfileManager::GetDefaultProfileOrOffTheRecord();
 }
 
 void ChromeLauncherController::LauncherItemClosed(ash::LauncherID id) {
   IDToItemControllerMap::iterator iter = id_to_item_controller_map_.find(id);
   CHECK(iter != id_to_item_controller_map_.end());
   CHECK(iter->second);
   app_icon_loader_->ClearImage(iter->second->app_id());
   iter->second->OnRemoved();
@@ skipping 251 matching lines @@
 
 std::vector<content::WebContents*>
 ChromeLauncherController::GetV1ApplicationsFromController(
     LauncherItemController* controller) {
   DCHECK(controller->type() == LauncherItemController::TYPE_SHORTCUT);
   AppShortcutLauncherItemController* app_controller =
       static_cast<AppShortcutLauncherItemController*>(controller);
   return app_controller->GetRunningApplications();
 }
 
-bool ChromeLauncherController::IsBrowserRepresentedInBrowserList(
-    Browser* browser) {
-  return (browser &&
-          (browser->is_type_tabbed() ||
-           !browser->is_app() ||
-           !browser->is_type_popup() ||
-           GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName(
-               browser->app_name())) <= 0));
-}
-
-LauncherItemController*
+BrowserShortcutLauncherItemController*
 ChromeLauncherController::GetBrowserShortcutLauncherItemController() {
   for (IDToItemControllerMap::iterator i = id_to_item_controller_map_.begin();
       i != id_to_item_controller_map_.end(); ++i) {
     int index = model_->ItemIndexByID(i->first);
     const ash::LauncherItem& item = model_->items()[index];
     if (item.type == ash::TYPE_BROWSER_SHORTCUT)
-      return i->second;
+      return static_cast<BrowserShortcutLauncherItemController*>(i->second);
   }
   // LauncerItemController For Browser Shortcut must be existed. If it does not
-  // existe create it.
+  // exist, create it.

[Mr4D (OOO till 08-26), 2013/09/04 15:12:33]

What about:

// Create a LauncherItemController for the Browser shortcut if it does not exist
yet.

[simonhong_, 2013/09/04 17:08:31]

Done.

   ash::LauncherID id = CreateBrowserShortcutLauncherItem();
   DCHECK(id_to_item_controller_map_[id]);
-  return id_to_item_controller_map_[id];
+  return static_cast<BrowserShortcutLauncherItemController*>(
+      id_to_item_controller_map_[id]);
 }
 
 ash::LauncherID ChromeLauncherController::CreateBrowserShortcutLauncherItem() {
   ash::LauncherItem browser_shortcut;
   browser_shortcut.type = ash::TYPE_BROWSER_SHORTCUT;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   browser_shortcut.image = *rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_32);
   ash::LauncherID id = model_->next_id();
   size_t index = GetChromeIconIndexFromPref();
   model_->AddAt(index, browser_shortcut);
@@ skipping 63 matching lines @@
   // TODO(simon.hong81): Register LauncherItemDelegate when LauncherItemDelegate
   // is created.
   ash::LauncherItemDelegateManager* manager =
       ash::Shell::GetInstance()->launcher_item_delegate_manager();
   manager->RegisterLauncherItemDelegate(ash::TYPE_APP_PANEL, this);
   manager->RegisterLauncherItemDelegate(ash::TYPE_APP_SHORTCUT, this);
   manager->RegisterLauncherItemDelegate(ash::TYPE_BROWSER_SHORTCUT, this);
   manager->RegisterLauncherItemDelegate(ash::TYPE_PLATFORM_APP, this);
   manager->RegisterLauncherItemDelegate(ash::TYPE_WINDOWED_APP, this);
 }