First cut at supporting activation in the window manager

mojo/services/window_manager/window_manager_app.h

 // Copyright 2014 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 MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 14 matching lines @@
 
 namespace aura {
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
 class Window;
 }
 
 namespace wm {
+class FocusRules;
 class ScopedCaptureClient;
 }
 
 namespace mojo {
 
 class AuraInit;
 class DummyDelegate;
 class WindowManagerServiceImpl;
 class WindowTreeHostMojo;
 
@@ skipping 16 matching lines @@
       public WindowTreeHostMojoDelegate,
       public ui::EventHandler,
       public aura::client::FocusChangeObserver,
       public aura::client::ActivationChangeObserver {
  public:
   WindowManagerApp(ViewManagerDelegate* view_manager_delegate,
                    WindowManagerDelegate* window_manager_delegate);
   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);
   void RemoveConnection(WindowManagerServiceImpl* connection);
 
   // These are canonical implementations of the window manager API methods.
   void SetCapture(Id view);
   void FocusWindow(Id view);
   void ActivateWindow(Id view);
 
   bool IsReady() const;
 
   // A client of this object will use this accessor to gain access to the
   // 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)
       MOJO_OVERRIDE;
 
  private:
   typedef std::set<WindowManagerServiceImpl*> Connections;
   typedef std::map<Id, aura::Window*> ViewIdToWindowMap;
 
   // Overridden from ViewManagerDelegate:
@@ skipping 26 matching lines @@
   virtual void OnEvent(ui::Event* event) MOJO_OVERRIDE;
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,
                                aura::Window* lost_focus) MOJO_OVERRIDE;
 
   // Overridden from aura::client::ActivationChangeObserver:
   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().
   // TODO(beng): perhaps View should have a property bag.
   void RegisterSubtree(View* view, aura::Window* parent);
   // Deletes the aura::Windows associated with the hierarchy beneath |id|,
   // and removes from the registry.
   void UnregisterSubtree(View* view);
 
   InterfaceFactoryImplWithContext<WindowManagerServiceImpl, WindowManagerApp>
@@ skipping 17 matching lines @@
   ViewIdToWindowMap view_id_to_window_map_;
 
   scoped_ptr<DummyDelegate> dummy_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_