Move focus from the view manager to the window manager.

mojo/services/window_manager/window_manager_app.cc

Index: mojo/services/window_manager/window_manager_app.cc
diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
index 56d123923818dca9d72d6a6cc779c55b05c01772..27ee236e3db582e4c16cec640262e3e5a4afdf54 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/mojo/services/window_manager/window_manager_app.cc
@@ -7,12 +7,14 @@
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
-#include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/public/cpp/application/application_connection.h"
+#include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_delegate.h"
 #include "ui/aura/window_property.h"
+#include "ui/base/hit_test.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/focus_rules.h"
@@ -21,12 +23,52 @@
 DECLARE_WINDOW_PROPERTY_TYPE(mojo::View*);
 
 namespace mojo {
+
+// The aura::Windows we use to track Views don't render, so we don't actually
+// need to supply a fully functional WindowDelegate. We do need to provide _a_
+// delegate however, otherwise the event dispatcher won't dispatch events to
+// these windows. (The aura WindowTargeter won't allow a delegate-less window
+// to be the target of an event, since the window delegate is considered the
+// "target handler").
+class DummyDelegate : public aura::WindowDelegate {
+ public:
+  DummyDelegate() {}
+  virtual ~DummyDelegate() {}
+
+ private:
+  // WindowDelegate overrides:
+  virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); }
+  virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); }
+  virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
+                               const gfx::Rect& new_bounds) OVERRIDE {}
+  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
+    return gfx::kNullCursor;
+  }
+  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
+    return HTCAPTION;
+  }
+  virtual bool ShouldDescendIntoChildForEventHandling(
+      aura::Window* child,
+      const gfx::Point& location) OVERRIDE { return true; }
+  virtual bool CanFocus() OVERRIDE { return true; }
+  virtual void OnCaptureLost() OVERRIDE {}
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {}
+  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
+  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {}
+  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {}
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
+  virtual bool HasHitTestMask() const OVERRIDE { return false; }
+  virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
+
+  DISALLOW_COPY_AND_ASSIGN(DummyDelegate);
+};
+
 namespace {
 
 DEFINE_WINDOW_PROPERTY_KEY(View*, kViewKey, NULL);
 
 Id GetIdForWindow(aura::Window* window) {
-  return window ? window->GetProperty(kViewKey)->id() : 0;
+  return window ? WindowManagerApp::GetViewForWindow(window)->id() : 0;
 }
 
 class WMFocusRules : public wm::FocusRules {
@@ -70,16 +112,25 @@ class WMFocusRules : public wm::FocusRules {
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
-WindowManagerApp::WindowManagerApp(ViewManagerDelegate* delegate)
+WindowManagerApp::WindowManagerApp(
+    ViewManagerDelegate* view_manager_delegate,
+    WindowManagerDelegate* window_manager_delegate)
     : window_manager_service_factory_(this),
-      wrapped_delegate_(delegate),
+      wrapped_view_manager_delegate_(view_manager_delegate),
+      wrapped_window_manager_delegate_(window_manager_delegate),
       view_manager_(NULL),
       view_manager_client_factory_(this),
-      root_(NULL) {
+      root_(NULL),
+      dummy_delegate_(new DummyDelegate) {
 }
 
 WindowManagerApp::~WindowManagerApp() {}
 
+// static
+View* WindowManagerApp::GetViewForWindow(aura::Window* window) {
+  return window->GetProperty(kViewKey);
+}
+
 void WindowManagerApp::AddConnection(WindowManagerServiceImpl* connection) {
   DCHECK(connections_.find(connection) == connections_.end());
   connections_.insert(connection);
@@ -135,12 +186,14 @@ void WindowManagerApp::OnEmbed(ViewManager* view_manager,
                                scoped_ptr<ServiceProvider> imported_services) {
   DCHECK(!view_manager_ && !root_);
   view_manager_ = view_manager;
+  view_manager_->SetWindowManagerDelegate(this);
   root_ = root;
-  root_->AddObserver(this);
 
   window_tree_host_.reset(new WindowTreeHostMojo(root_, this));
+  window_tree_host_->window()->SetBounds(root->bounds());
+  window_tree_host_->window()->Show();
 
-  RegisterSubtree(root_->id(), window_tree_host_->window());
+  RegisterSubtree(root_, window_tree_host_->window());
 
   capture_client_.reset(
       new wm::ScopedCaptureClient(window_tree_host_->window()));
@@ -148,13 +201,14 @@ void WindowManagerApp::OnEmbed(ViewManager* view_manager,
       new wm::FocusController(new WMFocusRules);
   activation_client_ = focus_controller;
   focus_client_.reset(focus_controller);
+  aura::client::SetFocusClient(window_tree_host_->window(), focus_controller);
 
   focus_client_->AddObserver(this);
   activation_client_->AddObserver(this);
 
-  if (wrapped_delegate_) {
-    wrapped_delegate_->OnEmbed(view_manager, root, exported_services,
-                               imported_services.Pass());
+  if (wrapped_view_manager_delegate_) {
+    wrapped_view_manager_delegate_->OnEmbed(
+        view_manager, root, exported_services, imported_services.Pass());
   }
 
   for (Connections::const_iterator it = connections_.begin();
@@ -166,18 +220,36 @@ void WindowManagerApp::OnEmbed(ViewManager* view_manager,
 void WindowManagerApp::OnViewManagerDisconnected(
     ViewManager* view_manager) {
   DCHECK_EQ(view_manager_, view_manager);
-  if (wrapped_delegate_)
-    wrapped_delegate_->OnViewManagerDisconnected(view_manager);
+  if (wrapped_view_manager_delegate_)
+    wrapped_view_manager_delegate_->OnViewManagerDisconnected(view_manager);
   view_manager_ = NULL;
   base::MessageLoop::current()->Quit();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// WindowManagerApp, WindowManagerDelegate implementation:
+
+void WindowManagerApp::Embed(
+    const String& url,
+    InterfaceRequest<ServiceProvider> service_provider) {
+  if (wrapped_window_manager_delegate_)
+    wrapped_window_manager_delegate_->Embed(url, service_provider.Pass());
+}
+
+void WindowManagerApp::DispatchEvent(EventPtr event) {
+  scoped_ptr<ui::Event> ui_event =
+      TypeConverter<EventPtr, scoped_ptr<ui::Event> >::ConvertTo(event);
+  if (ui_event)
+    window_tree_host_->SendEventToProcessor(ui_event.get());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ViewObserver implementation:
 
 void WindowManagerApp::OnTreeChanged(
     const ViewObserver::TreeChangeParams& params) {
-  DCHECK_EQ(params.receiver, root_);
+  if (params.receiver != root_)
+    return;
   DCHECK(params.old_parent || params.new_parent);
   if (!params.target)
     return;
@@ -188,14 +260,16 @@ void WindowManagerApp::OnTreeChanged(
       ViewIdToWindowMap::const_iterator it =
           view_id_to_window_map_.find(params.new_parent->id());
       DCHECK(it != view_id_to_window_map_.end());
-      RegisterSubtree(params.target->id(), it->second);
+      RegisterSubtree(params.target, it->second);
     }
   } else if (params.old_parent) {
-    UnregisterSubtree(params.target->id());
+    UnregisterSubtree(params.target);
   }
 }
 
 void WindowManagerApp::OnViewDestroyed(View* view) {
+  if (view != root_)
+    return;
   root_ = NULL;
   STLDeleteValues(&view_id_to_window_map_);
   if (focus_client_.get())
@@ -205,6 +279,13 @@ void WindowManagerApp::OnViewDestroyed(View* view) {
   window_tree_host_.reset();
 }
 
+void WindowManagerApp::OnViewBoundsChanged(View* view,
+                                           const gfx::Rect& old_bounds,
+                                           const gfx::Rect& new_bounds) {
+  aura::Window* window = GetWindowForViewId(view->id());
+  window->SetBounds(new_bounds);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, WindowTreeHostMojoDelegate implementation:
 
@@ -214,6 +295,16 @@ void WindowManagerApp::CompositorContentsChanged(const SkBitmap& bitmap) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// WindowManagerApp, ui::EventHandler implementation:
+
+void WindowManagerApp::OnEvent(ui::Event* event) {
+  aura::Window* window = static_cast<aura::Window*>(event->target());
+  view_manager_->DispatchEvent(
+      GetViewForWindow(window),
+      TypeConverter<EventPtr, ui::Event>::ConvertFrom(*event));
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, aura::client::FocusChangeObserver implementation:
 
 void WindowManagerApp::OnWindowFocused(aura::Window* gained_focus,
@@ -245,28 +336,35 @@ aura::Window* WindowManagerApp::GetWindowForViewId(Id view) const {
   return it != view_id_to_window_map_.end() ? it->second : NULL;
 }
 
-void WindowManagerApp::RegisterSubtree(Id id,
-                                       aura::Window* parent) {
-  View* view = view_manager_->GetViewById(id);
-  DCHECK(view_id_to_window_map_.find(id) == view_id_to_window_map_.end());
-  aura::Window* window = new aura::Window(NULL);
+void WindowManagerApp::RegisterSubtree(View* view, aura::Window* parent) {
+  view->AddObserver(this);
+  DCHECK(view_id_to_window_map_.find(view->id()) ==
+         view_id_to_window_map_.end());
+  aura::Window* window = new aura::Window(dummy_delegate_.get());
+  window->set_id(view->id());
   window->SetProperty(kViewKey, view);
+  // All events pass through the root during dispatch, so we only need a handler
+  // installed there.
+  if (view == root_)
+    window->AddPreTargetHandler(this);

[sky, 2014/08/15 18:03:56]

RemovePreTargetHandler in destructor?

   parent->AddChild(window);
-  view_id_to_window_map_[id] = window;
+  window->SetBounds(view->bounds());
+  window->Show();
+  view_id_to_window_map_[view->id()] = window;
   View::Children::const_iterator it = view->children().begin();
   for (; it != view->children().end(); ++it)
-    RegisterSubtree((*it)->id(), window);
+    RegisterSubtree(*it, window);
 }
 
-void WindowManagerApp::UnregisterSubtree(Id id) {
-  View* view = view_manager_->GetViewById(id);
-  ViewIdToWindowMap::iterator it = view_id_to_window_map_.find(id);
+void WindowManagerApp::UnregisterSubtree(View* view) {
+  view->RemoveObserver(this);
+  ViewIdToWindowMap::iterator it = view_id_to_window_map_.find(view->id());
   DCHECK(it != view_id_to_window_map_.end());
   scoped_ptr<aura::Window> window(it->second);
   view_id_to_window_map_.erase(it);
   View::Children::const_iterator child = view->children().begin();
   for (; child != view->children().end(); ++child)
-    UnregisterSubtree((*child)->id());
+    UnregisterSubtree(*child);
 }
 
 }  // namespace mojo