Simplifying launcher handling by removing an unnecessary data structure and some functions

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 245 matching lines @@
       aura::Window* root_window) const;
 
   // Returns |true| if the user is allowed to modify the shelf auto-hide
   // behavior on |root_window|.
   bool CanUserModifyShelfAutoHideBehavior(aura::Window* root_window) const;
 
   // Toggles the shelf auto-hide behavior on |root_window|. Does nothing if the
   // user is not allowed to modify the auto-hide behavior.
   void ToggleShelfAutoHideBehavior(aura::Window* root_window);
 
-  // The tab no longer represents its previously identified application.
-  void RemoveTabFromRunningApp(content::WebContents* tab,
-                               const std::string& app_id);
-
   // Notify the controller that the state of an non platform app's tabs
   // have changed,
   void UpdateAppState(content::WebContents* contents, AppState app_state);
 
   // Returns ShelfID for |contents|. If |contents| is not an app or is not
   // pinned, returns the id of browser shrotcut.
   ash::ShelfID GetShelfIDForWebContents(content::WebContents* contents);
 
   // Limits application refocusing to urls that match |url| for |id|.
   void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url);
@@ skipping 127 matching lines @@
   // take an ownership of it.
   void SetShelfItemDelegateManagerForTest(
       ash::ShelfItemDelegateManager* manager);
 
  private:
   friend class ChromeLauncherControllerTest;
   friend class ShelfAppBrowserTest;
   friend class LauncherPlatformAppBrowserTest;
 
   typedef std::map<ash::ShelfID, LauncherItemController*> IDToItemControllerMap;
-  typedef std::list<content::WebContents*> WebContentsList;
-  typedef std::map<std::string, WebContentsList> AppIDToWebContentsListMap;
   typedef std::map<content::WebContents*, std::string> WebContentsToAppIDMap;
 
   // Remembers / restores list of running applications.
   // Note that this order will neither be stored in the preference nor will it
   // remember the order of closed applications since it is only temporary.
   void RememberUnpinnedRunningApplicationOrder();
   void RestoreUnpinnedRunningApplicationOrder(const std::string& user_id);
 
   // Creates a new app shortcut item and controller on the shelf at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
@@ skipping 28 matching lines @@
 
   // Sets the shelf auto-hide behavior from prefs.
   void SetShelfAutoHideBehaviorFromPrefs();
 
   // Sets the shelf alignment from prefs.
   void SetShelfAlignmentFromPrefs();
 
   // Sets both of auto-hide behavior and alignment from prefs.
   void SetShelfBehaviorsFromPrefs();
 
-  // Returns the most recently active web contents for an app.
-  content::WebContents* GetLastActiveWebContents(const std::string& app_id);
+  // Returns the shelf item status for the given |app_id|, which can be either
+  // STATUS_ACTIVE (if the app is active), STATUS_RUNNING (if there is such an
+  // app) or STATUS_CLOSED.
+  ash::ShelfItemStatus GetAppState(const::std::string& app_id);
 
   // Creates an app launcher to insert at |index|. Note that |index| may be
   // adjusted by the model to meet ordering constraints.
   // The |shelf_item_type| will be set into the ShelfModel.
   ash::ShelfID InsertAppLauncherItem(LauncherItemController* controller,
                                         const std::string& app_id,
                                         ash::ShelfItemStatus status,
                                         int index,
                                         ash::ShelfItemType shelf_item_type);
 
@@ skipping 62 matching lines @@
   ash::ShelfModel* model_;
 
   ash::ShelfItemDelegateManager* item_delegate_manager_;
 
   // Profile used for prefs and loading extensions. This is NOT necessarily the
   // profile new windows are created with.
   Profile* profile_;
 
   IDToItemControllerMap id_to_item_controller_map_;
 
-  // Maintains activation order of web contents for each app.
-  AppIDToWebContentsListMap app_id_to_web_contents_list_;
-
   // Direct access to app_id for a web contents.
   WebContentsToAppIDMap web_contents_to_app_id_;
 
   // Used to track app windows.
   scoped_ptr<AppWindowLauncherController> app_window_controller_;
 
   // Used to get app info for tabs.
   scoped_ptr<AppTabHelper> app_tab_helper_;
 
   // Used to load the image for an app item.
@@ skipping 25 matching lines @@
   // The list of running & un-pinned applications for different users on hidden
   // desktops.
   typedef std::vector<std::string> RunningAppListIds;
   typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
   RunningAppListIdMap last_used_running_application_order_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_