| OLD | NEW |
| 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 19 matching lines...) Expand all Loading... |
| 30 return direction == ORDER_ABOVE ? "above" : "below"; | 30 return direction == ORDER_ABOVE ? "above" : "below"; |
| 31 } | 31 } |
| 32 | 32 |
| 33 std::string ChangeToDescription1(const Change& change) { | 33 std::string ChangeToDescription1(const Change& change) { |
| 34 switch (change.type) { | 34 switch (change.type) { |
| 35 case CHANGE_TYPE_CONNECTION_ESTABLISHED: | 35 case CHANGE_TYPE_CONNECTION_ESTABLISHED: |
| 36 return base::StringPrintf("OnConnectionEstablished creator=%s", | 36 return base::StringPrintf("OnConnectionEstablished creator=%s", |
| 37 change.creator_url.data()); | 37 change.creator_url.data()); |
| 38 | 38 |
| 39 case CHANGE_TYPE_ROOTS_ADDED: | 39 case CHANGE_TYPE_ROOTS_ADDED: |
| 40 return "OnRootsAdded"; | 40 return "OnRootAdded"; |
| 41 | 41 |
| 42 case CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED: | 42 case CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED: |
| 43 return base::StringPrintf( | 43 return base::StringPrintf( |
| 44 "ServerChangeIdAdvanced %d", static_cast<int>(change.change_id)); | 44 "ServerChangeIdAdvanced %d", static_cast<int>(change.change_id)); |
| 45 | 45 |
| 46 | 46 |
| 47 case CHANGE_TYPE_NODE_BOUNDS_CHANGED: | 47 case CHANGE_TYPE_NODE_BOUNDS_CHANGED: |
| 48 return base::StringPrintf( | 48 return base::StringPrintf( |
| 49 "BoundsChanged node=%s old_bounds=%s new_bounds=%s", | 49 "BoundsChanged node=%s old_bounds=%s new_bounds=%s", |
| 50 NodeIdToString(change.node_id).c_str(), | 50 NodeIdToString(change.node_id).c_str(), |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 Array<NodeDataPtr> nodes) { | 151 Array<NodeDataPtr> nodes) { |
| 152 Change change; | 152 Change change; |
| 153 change.type = CHANGE_TYPE_CONNECTION_ESTABLISHED; | 153 change.type = CHANGE_TYPE_CONNECTION_ESTABLISHED; |
| 154 change.connection_id = connection_id; | 154 change.connection_id = connection_id; |
| 155 change.change_id = next_server_change_id; | 155 change.change_id = next_server_change_id; |
| 156 change.creator_url = creator_url; | 156 change.creator_url = creator_url; |
| 157 NodeDatasToTestNodes(nodes, &change.nodes); | 157 NodeDatasToTestNodes(nodes, &change.nodes); |
| 158 AddChange(change); | 158 AddChange(change); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void TestChangeTracker::OnRootsAdded(Array<NodeDataPtr> nodes) { | 161 void TestChangeTracker::OnRootAdded(Array<NodeDataPtr> nodes) { |
| 162 Change change; | 162 Change change; |
| 163 change.type = CHANGE_TYPE_ROOTS_ADDED; | 163 change.type = CHANGE_TYPE_ROOTS_ADDED; |
| 164 NodeDatasToTestNodes(nodes, &change.nodes); | 164 NodeDatasToTestNodes(nodes, &change.nodes); |
| 165 AddChange(change); | 165 AddChange(change); |
| 166 } | 166 } |
| 167 | 167 |
| 168 void TestChangeTracker::OnServerChangeIdAdvanced(Id change_id) { | 168 void TestChangeTracker::OnServerChangeIdAdvanced(Id change_id) { |
| 169 Change change; | 169 Change change; |
| 170 change.type = CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED; | 170 change.type = CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED; |
| 171 change.change_id = change_id; | 171 change.change_id = change_id; |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 std::string TestNode::ToString() const { | 254 std::string TestNode::ToString() const { |
| 255 return base::StringPrintf("node=%s parent=%s view=%s", | 255 return base::StringPrintf("node=%s parent=%s view=%s", |
| 256 NodeIdToString(node_id).c_str(), | 256 NodeIdToString(node_id).c_str(), |
| 257 NodeIdToString(parent_id).c_str(), | 257 NodeIdToString(parent_id).c_str(), |
| 258 NodeIdToString(view_id).c_str()); | 258 NodeIdToString(view_id).c_str()); |
| 259 } | 259 } |
| 260 | 260 |
| 261 } // namespace service | 261 } // namespace service |
| 262 } // namespace view_manager | 262 } // namespace view_manager |
| 263 } // namespace mojo | 263 } // namespace mojo |
| OLD | NEW |