Add support for managing active state of platform apps

chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.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_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model_observer.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/wm/shelf_auto_hide_behavior.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "ui/aura/client/activation_change_observer.h"
+#include "ui/aura/window_observer.h"
 
 namespace ash {
 class LauncherModel;
 }
 
+namespace aura {
+class Window;
+
+namespace client {
+class ActivationClient;
+}
+
+}
+
 class BrowserLauncherItemController;
 class BrowserLauncherItemControllerTest;
 class PrefService;
 class Profile;
 class TabContents;
 typedef TabContents TabContentsWrapper;
 
 // ChromeLauncherController manages the launcher items needed for tabbed
 // browsers (BrowserLauncherItemController) and browser shortcuts.
 class ChromeLauncherController : public ash::LauncherDelegate,
                                  public ash::LauncherModelObserver,
                                  public content::NotificationObserver,
-                                 public ShellWindowRegistry::Observer {
+                                 public ShellWindowRegistry::Observer,
+                                 public aura::client::ActivationChangeObserver,
+                                 public aura::WindowObserver {
  public:
   // Indicates if a launcher item is incognito or not.
   enum IncognitoState {
     STATE_INCOGNITO,
     STATE_NOT_INCOGNITO,
   };
 
   // Interface used to load app icons. This is in it's own class so that it can
   // be mocked.
   class AppIconLoader {
@@ skipping 127 matching lines @@
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from ShellWindowRegistry::Observer:
   virtual void OnShellWindowAdded(ShellWindow* shell_window) OVERRIDE;
   virtual void OnShellWindowRemoved(ShellWindow* shell_window) OVERRIDE;
 
+  // Overriden from client::ActivationChangeObserver:
+  virtual void OnWindowActivated(
+      aura::Window* active, aura::Window* old_active) OVERRIDE;

[sky, 2012/06/11 17:47:39]

nit: each arg on its own line.

[DaveMoore, 2012/06/11 18:13:40]

Done.

+
+  // Overriden from aura::WindowObserver:
+  virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE;
+
  private:
   friend class BrowserLauncherItemControllerTest;
   friend class ChromeLauncherControllerTest;
 
   enum ItemType {
     TYPE_APP,
     TYPE_TABBED_BROWSER
   };
 
   // Used to identity an item on the launcher.
   struct Item {
     Item();
     ~Item();
 
     bool is_pinned() const { return controller == NULL; }
 
     // Type of item.
     ItemType item_type;
 
     // ID of the app.
     std::string app_id;
 
     // The BrowserLauncherItemController this item came from. NULL if a
     // shortcut.
     BrowserLauncherItemController* controller;
   };
 
   typedef std::map<ash::LauncherID, Item> IDToItemMap;
+  typedef std::map<aura::Window*, ash::LauncherID> WindowToIDMap;
 
   // Updates the pinned pref state. The pinned state consists of a list pref.
   // Each item of the list is a dictionary. The key |kAppIDPath| gives the
   // id of the app.
   void PersistPinnedState();
 
   // Sets the AppIconLoader, taking ownership of |loader|. This is intended for
   // testing.
   void SetAppIconLoaderForTest(AppIconLoader* loader);
 
@@ skipping 25 matching lines @@
 
   static ChromeLauncherController* instance_;
 
   ash::LauncherModel* model_;
 
   // Profile used for prefs and loading extensions. This is NOT necessarily the
   // profile new windows are created with.
   Profile* profile_;
 
   IDToItemMap id_to_item_map_;
+  WindowToIDMap window_to_id_map_;

[sky, 2012/06/11 17:47:39]

Add a description for this. Especially mention its only used for shell windows.

[DaveMoore, 2012/06/11 18:13:40]

Done.

 
   // Used to load the image for an app tab.
   scoped_ptr<AppIconLoader> app_icon_loader_;
 
   content::NotificationRegistrar notification_registrar_;
 
   PrefChangeRegistrar pref_change_registrar_;
+  aura::client::ActivationClient* activation_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_