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 "components/mus/ws/test_change_tracker.h" | 5 #include "components/mus/ws/test_change_tracker.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 } | 24 } |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 std::string RectToString(const mojo::Rect& rect) { | 28 std::string RectToString(const mojo::Rect& rect) { |
29 return base::StringPrintf("%d,%d %dx%d", rect.x, rect.y, rect.width, | 29 return base::StringPrintf("%d,%d %dx%d", rect.x, rect.y, rect.width, |
30 rect.height); | 30 rect.height); |
31 } | 31 } |
32 | 32 |
33 std::string DirectionToString(mojom::OrderDirection direction) { | 33 std::string DirectionToString(mojom::OrderDirection direction) { |
34 return direction == mojom::ORDER_DIRECTION_ABOVE ? "above" : "below"; | 34 return direction == mojom::OrderDirection::ABOVE ? "above" : "below"; |
35 } | 35 } |
36 | 36 |
37 std::string ChangeToDescription1(const Change& change) { | 37 std::string ChangeToDescription1(const Change& change) { |
38 switch (change.type) { | 38 switch (change.type) { |
39 case CHANGE_TYPE_EMBED: | 39 case CHANGE_TYPE_EMBED: |
40 return "OnEmbed"; | 40 return "OnEmbed"; |
41 | 41 |
42 case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED: | 42 case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED: |
43 return base::StringPrintf("OnEmbeddedAppDisconnected window=%s", | 43 return base::StringPrintf("OnEmbeddedAppDisconnected window=%s", |
44 WindowIdToString(change.window_id).c_str()); | 44 WindowIdToString(change.window_id).c_str()); |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 test_windows->push_back(WindowDataToTestWindow(data[i])); | 180 test_windows->push_back(WindowDataToTestWindow(data[i])); |
181 } | 181 } |
182 | 182 |
183 Change::Change() | 183 Change::Change() |
184 : type(CHANGE_TYPE_EMBED), | 184 : type(CHANGE_TYPE_EMBED), |
185 connection_id(0), | 185 connection_id(0), |
186 window_id(0), | 186 window_id(0), |
187 window_id2(0), | 187 window_id2(0), |
188 window_id3(0), | 188 window_id3(0), |
189 event_action(0), | 189 event_action(0), |
190 direction(mojom::ORDER_DIRECTION_ABOVE), | 190 direction(mojom::OrderDirection::ABOVE), |
191 bool_value(false), | 191 bool_value(false), |
192 change_id(0u) {} | 192 change_id(0u) {} |
193 | 193 |
194 Change::~Change() {} | 194 Change::~Change() {} |
195 | 195 |
196 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {} | 196 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {} |
197 | 197 |
198 TestChangeTracker::~TestChangeTracker() {} | 198 TestChangeTracker::~TestChangeTracker() {} |
199 | 199 |
200 void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id, | 200 void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id, |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 change.window_id = window_id; | 310 change.window_id = window_id; |
311 change.bool_value = drawn; | 311 change.bool_value = drawn; |
312 AddChange(change); | 312 AddChange(change); |
313 } | 313 } |
314 | 314 |
315 void TestChangeTracker::OnWindowInputEvent(Id window_id, | 315 void TestChangeTracker::OnWindowInputEvent(Id window_id, |
316 mojom::EventPtr event) { | 316 mojom::EventPtr event) { |
317 Change change; | 317 Change change; |
318 change.type = CHANGE_TYPE_INPUT_EVENT; | 318 change.type = CHANGE_TYPE_INPUT_EVENT; |
319 change.window_id = window_id; | 319 change.window_id = window_id; |
320 change.event_action = event->action; | 320 change.event_action = static_cast<int32_t>(event->action); |
321 AddChange(change); | 321 AddChange(change); |
322 } | 322 } |
323 | 323 |
324 void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id, | 324 void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id, |
325 String name, | 325 String name, |
326 Array<uint8_t> data) { | 326 Array<uint8_t> data) { |
327 Change change; | 327 Change change; |
328 change.type = CHANGE_TYPE_PROPERTY_CHANGED; | 328 change.type = CHANGE_TYPE_PROPERTY_CHANGED; |
329 change.window_id = window_id; | 329 change.window_id = window_id; |
330 change.property_key = name; | 330 change.property_key = name; |
(...skipping 10 matching lines...) Expand all Loading... |
341 change.window_id = window_id; | 341 change.window_id = window_id; |
342 AddChange(change); | 342 AddChange(change); |
343 } | 343 } |
344 | 344 |
345 void TestChangeTracker::OnWindowPredefinedCursorChanged( | 345 void TestChangeTracker::OnWindowPredefinedCursorChanged( |
346 Id window_id, | 346 Id window_id, |
347 mojom::Cursor cursor_id) { | 347 mojom::Cursor cursor_id) { |
348 Change change; | 348 Change change; |
349 change.type = CHANGE_TYPE_CURSOR_CHANGED; | 349 change.type = CHANGE_TYPE_CURSOR_CHANGED; |
350 change.window_id = window_id; | 350 change.window_id = window_id; |
351 change.cursor_id = cursor_id; | 351 change.cursor_id = static_cast<int32_t>(cursor_id); |
352 AddChange(change); | 352 AddChange(change); |
353 } | 353 } |
354 | 354 |
355 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) { | 355 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) { |
356 Change change; | 356 Change change; |
357 change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED; | 357 change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED; |
358 change.change_id = change_id; | 358 change.change_id = change_id; |
359 change.bool_value = success; | 359 change.bool_value = success; |
360 AddChange(change); | 360 AddChange(change); |
361 } | 361 } |
(...skipping 26 matching lines...) Expand all Loading... |
388 std::string TestWindow::ToString2() const { | 388 std::string TestWindow::ToString2() const { |
389 return base::StringPrintf( | 389 return base::StringPrintf( |
390 "window=%s parent=%s visible=%s drawn=%s", | 390 "window=%s parent=%s visible=%s drawn=%s", |
391 WindowIdToString(window_id).c_str(), WindowIdToString(parent_id).c_str(), | 391 WindowIdToString(window_id).c_str(), WindowIdToString(parent_id).c_str(), |
392 visible ? "true" : "false", drawn ? "true" : "false"); | 392 visible ? "true" : "false", drawn ? "true" : "false"); |
393 } | 393 } |
394 | 394 |
395 } // namespace ws | 395 } // namespace ws |
396 | 396 |
397 } // namespace mus | 397 } // namespace mus |
OLD | NEW |