Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: trunk/src/mojo/services/view_manager/view_manager_connection.cc

Issue 304323005: Revert 273723 "Wire input events through the ViewManagerClient i..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/mojo/services/view_manager/view_manager_connection.cc
===================================================================
--- trunk/src/mojo/services/view_manager/view_manager_connection.cc (revision 273734)
+++ trunk/src/mojo/services/view_manager/view_manager_connection.cc (working copy)
@@ -4,10 +4,8 @@
#include "mojo/services/view_manager/view_manager_connection.h"
-#include "base/bind.h"
#include "base/stl_util.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/view_manager/node.h"
#include "mojo/services/view_manager/root_node_manager.h"
#include "mojo/services/view_manager/view.h"
@@ -171,17 +169,6 @@
new_view_id, old_view_id);
}
-void ViewManagerConnection::ProcessViewInputEvent(const View* view,
- const ui::Event* event) {
- const TransportViewId view_id = ViewIdToTransportId(view->id());
- if (view->id().connection_id != id_)
- return;
- client()->OnViewInputEvent(
- view_id,
- TypeConverter<EventPtr, ui::Event>::ConvertFrom(*event),
- base::Bind(&base::DoNothing));
-}
-
void ViewManagerConnection::ProcessNodeDeleted(
const NodeId& node,
TransportChangeId server_change_id,
@@ -626,11 +613,6 @@
root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view);
}
-void ViewManagerConnection::OnViewInputEvent(const View* view,
- const ui::Event* event) {
- root_node_manager_->ProcessViewInputEvent(view, event);
-}
-
void ViewManagerConnection::OnConnectionEstablished() {
DCHECK_EQ(0, id_); // Should only get OnConnectionEstablished() once.

Powered by Google App Engine
This is Rietveld 408576698