Splits window manager like methods into ViewManagerServiceDelegate

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/bind.h"
 #include "base/macros.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.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/c/system/main.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/public/cpp/application/service_provider_impl.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_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/navigation/navigation.mojom.h"
 #include "mojo/services/window_manager/window_manager_app.h"
+#include "mojo/services/window_manager/window_manager_delegate.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"
 #include "ui/wm/core/focus_rules.h"
 
 #if defined CreateWindow
 #undef CreateWindow
 #endif
@@ skipping 137 matching lines @@
   void Hide(Id view_id) {
     keyboard_service_->SetTarget(0);
     view_->SetVisible(false);
   }
 
  private:
   // KeyboardClient:
   virtual void OnKeyboardEvent(Id view_id,
                                int32_t code,
                                int32_t flags) override {
-    View* view = view_manager_->GetViewById(view_id);
-    if (!view)
-      return;
-#if defined(OS_WIN)
-    const bool is_char = code != ui::VKEY_BACK && code != ui::VKEY_RETURN;
-#else
-    const bool is_char = false;
-#endif
-    if (is_char) {
-      view_manager_->DispatchEvent(
-          view,
-          Event::From(ui::KeyEvent(ui::ET_KEY_PRESSED,
-                                   static_cast<ui::KeyboardCode>(code),
-                                   flags)));
-    } else {
-      view_manager_->DispatchEvent(
-          view,
-          Event::From(ui::KeyEvent(static_cast<base::char16>(code),
-                                   static_cast<ui::KeyboardCode>(code),
-                                   flags)));
-    }
-    view_manager_->DispatchEvent(
-        view,
-        Event::From(ui::KeyEvent(ui::ET_KEY_RELEASED,
-                                 static_cast<ui::KeyboardCode>(code),
-                                 flags)));
+    // TODO(sky): figure this out. Code use to dispatch events, but that's a
+    // hack. Instead strings should be passed through, or maybe a richer text
+    // input interface.
   }
 
   // Overridden from ViewObserver:
   virtual void OnViewBoundsChanged(View* parent,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) override {
     gfx::Rect keyboard_bounds(view_->bounds());
     keyboard_bounds.set_y(new_bounds.bottom() - keyboard_bounds.height());
     keyboard_bounds.set_width(keyboard_bounds.width() +
                               new_bounds.width() - old_bounds.width());
@@ skipping 236 matching lines @@
     base::MessageLoop::current()->Quit();
   }
 
   // Overridden from WindowManagerDelegate:
   virtual void Embed(
       const String& url,
       InterfaceRequest<ServiceProvider> service_provider) override {
     const Id kInvalidSourceViewId = 0;
     OnLaunch(kInvalidSourceViewId, TARGET_DEFAULT, url);
   }
-  virtual void DispatchEvent(EventPtr event) 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();
     }
   }
@@ skipping 141 matching lines @@
   window_manager_->RequestNavigate(view_id_, target, request.Pass());
 }
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager);
   return runner.Run(shell_handle);
 }