Move focus from the view manager to the window manager.

mojo/examples/window_manager/window_manager.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "mojo/examples/keyboard/keyboard.mojom.h"
 #include "mojo/examples/window_manager/debug_panel.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.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 "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"
 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
+#include "mojo/services/window_manager/window_manager_app.h"
 #include "mojo/views/views_init.h"
+#include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 #if defined CreateWindow
 #undef CreateWindow
 #endif
 
 namespace mojo {
 namespace examples {
@@ skipping 207 matching lines @@
   const Id launcher_ui_view_id_;
   const Id control_panel_view_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RootLayoutManager);
 };
 
 class WindowManager
     : public ApplicationDelegate,
       public DebugPanel::Delegate,
       public ViewManagerDelegate,
-      public WindowManagerDelegate {
+      public WindowManagerDelegate,
+      public ui::EventHandler {
  public:
   WindowManager()
       : window_manager_factory_(this),
         navigator_host_factory_(this),
         launcher_ui_(NULL),
         view_manager_(NULL),
-        view_manager_client_factory_(this),
+        window_manager_app_(new WindowManagerApp(this, this)),
         app_(NULL) {}
 
   virtual ~WindowManager() {}
 
   void CloseWindow(Id view_id) {
     View* view = view_manager_->GetViewById(view_id);
     DCHECK(view);
     std::vector<View*>::iterator iter =
         std::find(windows_.begin(), windows_.end(), view);
     DCHECK(iter != windows_.end());
@@ skipping 47 matching lines @@
                                  source_view_id,
                                  target));
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     app_ = app;
     app->ConnectToService("mojo:mojo_launcher", &launcher_);
     views_init_.reset(new ViewsInit);
+    window_manager_app_->Initialize(app);
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
     connection->AddService(&window_manager_factory_);
     connection->AddService(&navigator_host_factory_);
-    connection->AddService(&view_manager_client_factory_);
+    window_manager_app_->ConfigureIncomingConnection(connection);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(ViewManager* view_manager,
                        View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
     DCHECK(!view_manager_);
     view_manager_ = view_manager;
-    view_manager_->SetWindowManagerDelegate(this);
 
     View* view = View::Create(view_manager_);
     root->AddChild(view);
     view->SetBounds(gfx::Rect(root->bounds().size()));
     content_view_id_ = view->id();
 
     root->SetColor(SK_ColorBLUE);
 
     Id launcher_ui_id = CreateLauncherUI();
     Id control_panel_id = CreateControlPanel(view);
 
     root_layout_manager_.reset(
         new RootLayoutManager(view_manager, root,
                               content_view_id_,
                               launcher_ui_id,
                               control_panel_id));
     root->AddObserver(root_layout_manager_.get());
+
+    window_manager_app_->host()->window()->AddPreTargetHandler(this);

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

Do you need to remove the pre target handler at some point?

   }
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
     DCHECK_EQ(view_manager_, view_manager);
     view_manager_ = NULL;
     base::MessageLoop::current()->Quit();
   }
 
   // Overridden from WindowManagerDelegate:
   virtual void Embed(
       const String& url,
       InterfaceRequest<ServiceProvider> service_provider) OVERRIDE {
     CreateWindow(url,
                  NavigationDetailsPtr().Pass(),
                  ResponseDetailsPtr().Pass());
   }
-  virtual void DispatchEvent(View* target, EventPtr event) OVERRIDE {
-    // TODO(beng): More sophisticated focus handling than this is required!
-    if (event->action == EVENT_TYPE_MOUSE_PRESSED &&
-        !IsDescendantOfKeyboard(target)) {
-      target->SetFocus();
+  virtual void DispatchEvent(EventPtr event) MOJO_OVERRIDE {}
+
+  // Overridden from ui::EventHandler:
+  virtual void OnEvent(ui::Event* event) OVERRIDE {
+    View* view = WindowManagerApp::GetViewForWindow(
+        static_cast<aura::Window*>(event->target()));
+    if (event->type() == ui::ET_MOUSE_PRESSED &&
+        !IsDescendantOfKeyboard(view)) {
+      view->SetFocus();
     }
-    view_manager_->DispatchEvent(target, event.Pass());
   }
 
   void OnLaunch(
       uint32 source_view_id,
       Target requested_target,
       const mojo::String& handler_url,
       const mojo::String& view_url,
       ResponseDetailsPtr response) {
     // TODO(mpcomplete): This seems to be unused in favor of |response|. We
     // might need to use it (and fill it in properly, with method, etc) if we
@@ skipping 111 matching lines @@
       window_manager_factory_;
   InterfaceFactoryImplWithContext<NavigatorHostImpl, WindowManager>
       navigator_host_factory_;
 
   scoped_ptr<ViewsInit> views_init_;
   DebugPanel* debug_panel_;
   LauncherPtr launcher_;
   View* launcher_ui_;
   std::vector<View*> windows_;
   ViewManager* view_manager_;
-  ViewManagerClientFactory view_manager_client_factory_;
   scoped_ptr<RootLayoutManager> root_layout_manager_;
 
+  scoped_ptr<WindowManagerApp> window_manager_app_;
+
   // Id of the view most content is added to. The keyboard is NOT added here.
   Id content_view_id_;
 
   scoped_ptr<KeyboardManager> keyboard_manager_;
   ApplicationImpl* app_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 void WindowManagerConnection::CloseWindow(Id view_id) {
@@ skipping 21 matching lines @@
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::WindowManager;
 }
 
 }  // namespace mojo