Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new…

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_APP_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_APP_H_
 
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "ash/launcher/launcher_model_observer.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/aura/window_observer.h"
 
 class AppSyncUIState;
 class Browser;
 class BrowserLauncherItemControllerTest;
 class ExtensionEnableFlow;
 class LauncherItemController;
@@ skipping 20 matching lines @@
 //   owned by the BrowserView instance.
 // * App shell windows have ShellWindowLauncherItemController, owned by
 //   ShellWindowLauncherController.
 // * Shortcuts have no LauncherItemController.
 class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver,
                                        public ash::ShellObserver,
                                        public ChromeLauncherController,
                                        public content::NotificationObserver,
                                        public PrefServiceSyncableObserver,
                                        public AppSyncUIStateObserver,
-                                       public ExtensionEnableFlowDelegate {
+                                       public ExtensionEnableFlowDelegate,
+                                       public chrome::BrowserListObserver {
  public:
   ChromeLauncherControllerPerApp(Profile* profile, ash::LauncherModel* model);
   virtual ~ChromeLauncherControllerPerApp();
 
   // ChromeLauncherController overrides:
 
   // Initializes this ChromeLauncherControllerPerApp.
   virtual void Init() OVERRIDE;
 
   // Returns the new per application interface of the given launcher. If it is
@@ skipping 209 matching lines @@
 
   // Checks if a given |web_contents| is known to be associated with an
   // application of type |app_id|.
   bool IsWebContentHandledByApplication(content::WebContents* web_contents,
                                         const std::string& app_id);
 
   // Get the favicon for the application list by giving the |web_content|.
   // Note that for incognito windows the incognito icon will be returned.
   gfx::Image GetAppListIcon(content::WebContents* web_contents) const;
 
+  // Overridden from chrome::BrowserListObserver.
+  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+
  protected:
   // ChromeLauncherController overrides:
 
   // Creates a new app shortcut item and controller on the launcher at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
   virtual ash::LauncherID CreateAppShortcutLauncherItem(
       const std::string& app_id,
       int index) OVERRIDE;
 
   // Sets the AppTabHelper/AppIconLoader, taking ownership of the helper class.
   // These are intended for testing.
   virtual void SetAppTabHelperForTest(AppTabHelper* helper) OVERRIDE;
   virtual void SetAppIconLoaderForTest(AppIconLoader* loader) OVERRIDE;
   virtual const std::string& GetAppIdFromLauncherIdForTest(
       ash::LauncherID id) OVERRIDE;
 
  private:
   friend class ChromeLauncherControllerPerAppTest;
 
+  // Updates the activation state of the Broswer item.
+  void UpdateBrowserItemStatus();
+
   typedef std::map<ash::LauncherID, LauncherItemController*>
           IDToItemControllerMap;
   typedef std::list<content::WebContents*> WebContentsList;
   typedef std::map<std::string, WebContentsList> AppIDToWebContentsListMap;
   typedef std::map<content::WebContents*, std::string> WebContentsToAppIDMap;
 
   // Returns the profile used for new windows.
   Profile* GetProfileForNewWindows();
 
   // Invoked when the associated browser or app is closed.
@@ skipping 67 matching lines @@
   PrefChangeRegistrar pref_change_registrar_;
 
   AppSyncUIState* app_sync_ui_state_;
 
   scoped_ptr<ExtensionEnableFlow> extension_enable_flow_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerApp);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_APP_H_