First cut at supporting activation in the window manager

mojo/services/window_manager/window_manager_app.h

Index: mojo/services/window_manager/window_manager_app.h
diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h
index c60adc5fdf77455075440b8b31a53d5477243c50..b1638dbbf3bd7719f861b6f34c5fe17068b5d316 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -32,6 +32,7 @@ class Window;
 }
 
 namespace wm {
+class FocusRules;
 class ScopedCaptureClient;
 }
 
@@ -68,6 +69,7 @@ class WindowManagerApp
   virtual ~WindowManagerApp();
 
   static View* GetViewForWindow(aura::Window* window);
+  aura::Window* GetWindowForViewId(Id view) const;

[sky, 2014/09/26 23:01:41]

nit: either non-const, or return const aura::Window*.

 
   // Register/deregister new connections to the window manager service.
   void AddConnection(WindowManagerServiceImpl* connection);
@@ -84,6 +86,8 @@ class WindowManagerApp
   // aura::Window hierarchy and attach event handlers.
   aura::WindowTreeHost* host() { return window_tree_host_.get(); }
 
+  void InitFocus(wm::FocusRules* rules);
+
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE;
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
@@ -130,8 +134,6 @@ class WindowManagerApp
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) MOJO_OVERRIDE;
 
-  aura::Window* GetWindowForViewId(Id view) const;
-
   // Creates an aura::Window for every view in the hierarchy beneath |view|,
   // and adds to the registry so that it can be retrieved later via
   // GetWindowForViewId().