Wire input events through the ViewManagerClient interface.

Wire input events through the ViewManagerClient interface.

R=sky@chromium.org
http://crbug.com/365012

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273723

[sky, 2014-05-28 19:32:57]

LGTM

https://codereview.chromium.org/300863003/diff/90001/mojo/examples/sample_vie...
File mojo/examples/sample_view_manager_app/sample_view_manager_app.cc (right):

https://codereview.chromium.org/300863003/diff/90001/mojo/examples/sample_vie...
mojo/examples/sample_view_manager_app/sample_view_manager_app.cc:61: }
nit:  // namespace

https://codereview.chromium.org/300863003/diff/90001/mojo/services/view_manag...
File mojo/services/view_manager/root_node_manager.cc (right):

https://codereview.chromium.org/300863003/diff/90001/mojo/services/view_manag...
mojo/services/view_manager/root_node_manager.cc:173: 
nit: only one newline.

[Ben Goodger (Google), 2014-05-29 04:22:29]

The CQ bit was checked by ben@chromium.org

[commit-bot: I haz the power, 2014-05-29 04:23:44]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ben@chromium.org/300863003/140001

[commit-bot: I haz the power, 2014-05-29 20:32:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-29 20:32:12]

Failed to apply patch for
mojo/examples/sample_view_manager_app/sample_view_manager_app.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
  Hunk #1 FAILED at 6.
  Hunk #2 succeeded at 10 with fuzz 1 (offset -3 lines).
  Hunk #3 succeeded at 18 with fuzz 2 (offset -13 lines).
  Hunk #4 succeeded at 56 (offset -11 lines).
  Hunk #5 FAILED at 82.
  2 out of 5 hunks FAILED -- saving rejects to file
mojo/examples/sample_view_manager_app/sample_view_manager_app.cc.rej

Patch:       mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
Index: mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
diff --git a/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
b/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
index
0188fb299fab23a3f444407e5c0d062a7ebf71b3..b59f27601dc01fe0c173532c606c76ef4bcedc32
100644
--- a/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
+++ b/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
@@ -6,6 +6,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
@@ -13,7 +14,9 @@
 #include "mojo/public/cpp/utility/run_loop.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_observer.h"
 #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 
 #if defined(WIN32)
@@ -29,7 +32,35 @@
 namespace mojo {
 namespace examples {
 
-class SampleApp : public Application {
+namespace {
+
+std::string EventNameForAction(int32_t action) {
+  switch (action) {
+    case ui::ET_MOUSE_MOVED:
+      return "MouseMoved";
+    case ui::ET_MOUSE_PRESSED:
+      return "MousePressed";
+    case ui::ET_MOUSE_RELEASED:
+      return "MouseReleased";
+    case ui::ET_MOUSE_DRAGGED:
+      return "MouseDragged";
+    case ui::ET_KEY_PRESSED:
+      return "KeyPressed";
+    case ui::ET_KEY_RELEASED:
+      return "KeyReleased";
+    case ui::ET_TOUCH_PRESSED:
+      return "TouchPressed";
+    case ui::ET_TOUCH_RELEASED:
+      return "TouchReleased";
+    case ui::ET_TOUCH_MOVED:
+      return "TouchMoved";
+  }
+  return "Other";
+}
+
+}  // namespace
+
+class SampleApp : public Application, public mojo::view_manager::ViewObserver {
  public:
   explicit SampleApp(MojoHandle service_provider_handle)
       : Application(service_provider_handle) {
@@ -37,6 +68,7 @@ class SampleApp : public Application {
     view_manager_->Init();
     view_manager::ViewTreeNode* node1 =
         view_manager::ViewTreeNode::Create(view_manager_.get());
+    node1->SetBounds(gfx::Rect(800, 600));
     view_manager::ViewTreeNode* node11 =
         view_manager::ViewTreeNode::Create(view_manager_.get());
     node11->SetBounds(gfx::Rect(800, 600));
@@ -51,12 +83,27 @@ class SampleApp : public Application {
     canvas.DrawColor(SK_ColorRED);
     view11->SetContents(
         skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(true));
+
+    view11->AddObserver(this);
   }
 
   virtual ~SampleApp() {
   }
 
  private:
+  virtual void OnViewInputEvent(mojo::view_manager::View* view,
+                                const Event& event) OVERRIDE {
+    std::string event_name = EventNameForAction(event.action());
+    if (!event.location().is_null()) {
+      LOG(WARNING) << base::StringPrintf("Got %s @ %d,%d",
+                                         event_name.c_str(),
+                                         event.location().x(),
+                                         event.location().y());
+    } else {
+      LOG(WARNING) << base::StringPrintf("Got %s", event_name.c_str());
+    }
+  }
+
   // SampleApp creates a ViewManager and a trivial node hierarchy.
   scoped_ptr<view_manager::ViewManager> view_manager_;

[Ben Goodger (Google), 2014-05-30 05:28:25]

Committed patchset #10 manually as r273723 (presubmit successful).