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

Side by Side Diff: mojo/services/view_manager/test_change_tracker.cc

Issue 316713002: Wire input events through the ViewManagerClient interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/services/view_manager/test_change_tracker.h" 5 #include "mojo/services/view_manager/test_change_tracker.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "mojo/common/common_type_converters.h" 9 #include "mojo/common/common_type_converters.h"
10 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" 10 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 case CHANGE_TYPE_VIEW_DELETED: 59 case CHANGE_TYPE_VIEW_DELETED:
60 return base::StringPrintf("ViewDeleted view=%s", 60 return base::StringPrintf("ViewDeleted view=%s",
61 NodeIdToString(change.view_id).c_str()); 61 NodeIdToString(change.view_id).c_str());
62 62
63 case CHANGE_TYPE_VIEW_REPLACED: 63 case CHANGE_TYPE_VIEW_REPLACED:
64 return base::StringPrintf( 64 return base::StringPrintf(
65 "ViewReplaced node=%s new_view=%s old_view=%s", 65 "ViewReplaced node=%s new_view=%s old_view=%s",
66 NodeIdToString(change.node_id).c_str(), 66 NodeIdToString(change.node_id).c_str(),
67 NodeIdToString(change.view_id).c_str(), 67 NodeIdToString(change.view_id).c_str(),
68 NodeIdToString(change.view_id2).c_str()); 68 NodeIdToString(change.view_id2).c_str());
69
70 case CHANGE_TYPE_INPUT_EVENT:
71 return base::StringPrintf(
72 "InputEvent view=%s event_action=%d",
73 NodeIdToString(change.view_id).c_str(),
74 change.event_action);
69 } 75 }
70 return std::string(); 76 return std::string();
71 } 77 }
72 78
73 } // namespace 79 } // namespace
74 80
75 std::vector<std::string> ChangesToDescription1( 81 std::vector<std::string> ChangesToDescription1(
76 const std::vector<Change>& changes) { 82 const std::vector<Change>& changes) {
77 std::vector<std::string> strings(changes.size()); 83 std::vector<std::string> strings(changes.size());
78 for (size_t i = 0; i < changes.size(); ++i) 84 for (size_t i = 0; i < changes.size(); ++i)
(...skipping 22 matching lines...) Expand all
101 } 107 }
102 108
103 Change::Change() 109 Change::Change()
104 : type(CHANGE_TYPE_CONNECTION_ESTABLISHED), 110 : type(CHANGE_TYPE_CONNECTION_ESTABLISHED),
105 connection_id(0), 111 connection_id(0),
106 change_id(0), 112 change_id(0),
107 node_id(0), 113 node_id(0),
108 node_id2(0), 114 node_id2(0),
109 node_id3(0), 115 node_id3(0),
110 view_id(0), 116 view_id(0),
111 view_id2(0) {} 117 view_id2(0),
118 event_action(0) {}
112 119
113 Change::~Change() { 120 Change::~Change() {
114 } 121 }
115 122
116 TestChangeTracker::TestChangeTracker() 123 TestChangeTracker::TestChangeTracker()
117 : delegate_(NULL) { 124 : delegate_(NULL) {
118 } 125 }
119 126
120 TestChangeTracker::~TestChangeTracker() { 127 TestChangeTracker::~TestChangeTracker() {
121 } 128 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 TransportViewId new_view_id, 195 TransportViewId new_view_id,
189 TransportViewId old_view_id) { 196 TransportViewId old_view_id) {
190 Change change; 197 Change change;
191 change.type = CHANGE_TYPE_VIEW_REPLACED; 198 change.type = CHANGE_TYPE_VIEW_REPLACED;
192 change.node_id = node_id; 199 change.node_id = node_id;
193 change.view_id = new_view_id; 200 change.view_id = new_view_id;
194 change.view_id2 = old_view_id; 201 change.view_id2 = old_view_id;
195 AddChange(change); 202 AddChange(change);
196 } 203 }
197 204
205 void TestChangeTracker::OnViewInputEvent(TransportViewId view_id,
206 EventPtr event) {
207 Change change;
208 change.type = CHANGE_TYPE_INPUT_EVENT;
209 change.view_id = view_id;
210 change.event_action = event->action;
211 }
212
198 void TestChangeTracker::AddChange(const Change& change) { 213 void TestChangeTracker::AddChange(const Change& change) {
199 changes_.push_back(change); 214 changes_.push_back(change);
200 if (delegate_) 215 if (delegate_)
201 delegate_->OnChangeAdded(); 216 delegate_->OnChangeAdded();
202 } 217 }
203 218
204 std::string TestNode::ToString() const { 219 std::string TestNode::ToString() const {
205 return base::StringPrintf("node=%s parent=%s view=%s", 220 return base::StringPrintf("node=%s parent=%s view=%s",
206 NodeIdToString(node_id).c_str(), 221 NodeIdToString(node_id).c_str(),
207 NodeIdToString(parent_id).c_str(), 222 NodeIdToString(parent_id).c_str(),
208 NodeIdToString(view_id).c_str()); 223 NodeIdToString(view_id).c_str());
209 } 224 }
210 225
211 } // namespace service 226 } // namespace service
212 } // namespace view_manager 227 } // namespace view_manager
213 } // namespace mojo 228 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/view_manager/test_change_tracker.h ('k') | mojo/services/view_manager/view_manager_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698