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

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

Issue 405803002: Revert 284322 "Allow EmbedRoot to be called multiple times." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 "ViewReplaced node=%s new_view=%s old_view=%s", 73 "ViewReplaced node=%s new_view=%s old_view=%s",
74 NodeIdToString(change.node_id).c_str(), 74 NodeIdToString(change.node_id).c_str(),
75 NodeIdToString(change.view_id).c_str(), 75 NodeIdToString(change.view_id).c_str(),
76 NodeIdToString(change.view_id2).c_str()); 76 NodeIdToString(change.view_id2).c_str());
77 77
78 case CHANGE_TYPE_INPUT_EVENT: 78 case CHANGE_TYPE_INPUT_EVENT:
79 return base::StringPrintf( 79 return base::StringPrintf(
80 "InputEvent view=%s event_action=%d", 80 "InputEvent view=%s event_action=%d",
81 NodeIdToString(change.view_id).c_str(), 81 NodeIdToString(change.view_id).c_str(),
82 change.event_action); 82 change.event_action);
83 case CHANGE_TYPE_EMBED_ROOT:
84 return base::StringPrintf("EmbedRoot url=%s", change.embed_url.data());
85 } 83 }
86 return std::string(); 84 return std::string();
87 } 85 }
88 86
89 } // namespace 87 } // namespace
90 88
91 std::vector<std::string> ChangesToDescription1( 89 std::vector<std::string> ChangesToDescription1(
92 const std::vector<Change>& changes) { 90 const std::vector<Change>& changes) {
93 std::vector<std::string> strings(changes.size()); 91 std::vector<std::string> strings(changes.size());
94 for (size_t i = 0; i < changes.size(); ++i) 92 for (size_t i = 0; i < changes.size(); ++i)
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 216 }
219 217
220 void TestChangeTracker::OnViewInputEvent(Id view_id, EventPtr event) { 218 void TestChangeTracker::OnViewInputEvent(Id view_id, EventPtr event) {
221 Change change; 219 Change change;
222 change.type = CHANGE_TYPE_INPUT_EVENT; 220 change.type = CHANGE_TYPE_INPUT_EVENT;
223 change.view_id = view_id; 221 change.view_id = view_id;
224 change.event_action = event->action; 222 change.event_action = event->action;
225 AddChange(change); 223 AddChange(change);
226 } 224 }
227 225
228 void TestChangeTracker::OnEmbedRoot(const String& url) {
229 Change change;
230 change.type = CHANGE_TYPE_EMBED_ROOT;
231 change.embed_url = url;
232 AddChange(change);
233 }
234
235 void TestChangeTracker::AddChange(const Change& change) { 226 void TestChangeTracker::AddChange(const Change& change) {
236 changes_.push_back(change); 227 changes_.push_back(change);
237 if (delegate_) 228 if (delegate_)
238 delegate_->OnChangeAdded(); 229 delegate_->OnChangeAdded();
239 } 230 }
240 231
241 std::string TestNode::ToString() const { 232 std::string TestNode::ToString() const {
242 return base::StringPrintf("node=%s parent=%s view=%s", 233 return base::StringPrintf("node=%s parent=%s view=%s",
243 NodeIdToString(node_id).c_str(), 234 NodeIdToString(node_id).c_str(),
244 NodeIdToString(parent_id).c_str(), 235 NodeIdToString(parent_id).c_str(),
245 NodeIdToString(view_id).c_str()); 236 NodeIdToString(view_id).c_str());
246 } 237 }
247 238
248 } // namespace service 239 } // namespace service
249 } // namespace view_manager 240 } // namespace view_manager
250 } // namespace mojo 241 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698