Revert 273723 "Wire input events through the ViewManagerClient i..."

trunk/src/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc

Index: trunk/src/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
===================================================================
--- trunk/src/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc	(revision 273734)
+++ trunk/src/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc	(working copy)
@@ -4,50 +4,19 @@
 
 #include "base/at_exit.h"
 #include "base/bind.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"
 #include "mojo/public/cpp/system/macros.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"
 
 namespace mojo {
 namespace examples {
 
-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 {
+class SampleApp : public Application {
  public:
   SampleApp() {}
   virtual ~SampleApp() {}
@@ -57,7 +26,6 @@
     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));
@@ -72,24 +40,9 @@
     canvas.DrawColor(SK_ColorRED);
     view11->SetContents(
         skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(true));
-
-    view11->AddObserver(this);
   }
 
  private:
-  virtual void OnViewInputEvent(mojo::view_manager::View* view,
-                                EventPtr 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_;