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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 test_windows->push_back(WindowDataToTestWindow(data[i])); | 174 test_windows->push_back(WindowDataToTestWindow(data[i])); |
175 } | 175 } |
176 | 176 |
177 Change::Change() | 177 Change::Change() |
178 : type(CHANGE_TYPE_EMBED), | 178 : type(CHANGE_TYPE_EMBED), |
179 connection_id(0), | 179 connection_id(0), |
180 window_id(0), | 180 window_id(0), |
181 window_id2(0), | 181 window_id2(0), |
182 window_id3(0), | 182 window_id3(0), |
183 event_action(0), | 183 event_action(0), |
184 direction(mojom::ORDER_DIRECTION_ABOVE), | 184 direction(mojom::OrderDirection::ABOVE), |
185 bool_value(false) {} | 185 bool_value(false) {} |
186 | 186 |
187 Change::~Change() {} | 187 Change::~Change() {} |
188 | 188 |
189 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {} | 189 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {} |
190 | 190 |
191 TestChangeTracker::~TestChangeTracker() {} | 191 TestChangeTracker::~TestChangeTracker() {} |
192 | 192 |
193 void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id, | 193 void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id, |
194 mojom::WindowDataPtr root) { | 194 mojom::WindowDataPtr root) { |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 change.window_id = window_id; | 302 change.window_id = window_id; |
303 change.bool_value = drawn; | 303 change.bool_value = drawn; |
304 AddChange(change); | 304 AddChange(change); |
305 } | 305 } |
306 | 306 |
307 void TestChangeTracker::OnWindowInputEvent(Id window_id, | 307 void TestChangeTracker::OnWindowInputEvent(Id window_id, |
308 mojom::EventPtr event) { | 308 mojom::EventPtr event) { |
309 Change change; | 309 Change change; |
310 change.type = CHANGE_TYPE_INPUT_EVENT; | 310 change.type = CHANGE_TYPE_INPUT_EVENT; |
311 change.window_id = window_id; | 311 change.window_id = window_id; |
312 change.event_action = event->action; | 312 change.event_action = static_cast<int32_t>(event->action); |
313 AddChange(change); | 313 AddChange(change); |
314 } | 314 } |
315 | 315 |
316 void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id, | 316 void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id, |
317 String name, | 317 String name, |
318 Array<uint8_t> data) { | 318 Array<uint8_t> data) { |
319 Change change; | 319 Change change; |
320 change.type = CHANGE_TYPE_PROPERTY_CHANGED; | 320 change.type = CHANGE_TYPE_PROPERTY_CHANGED; |
321 change.window_id = window_id; | 321 change.window_id = window_id; |
322 change.property_key = name; | 322 change.property_key = name; |
(...skipping 10 matching lines...) Expand all Loading... |
333 change.window_id = window_id; | 333 change.window_id = window_id; |
334 AddChange(change); | 334 AddChange(change); |
335 } | 335 } |
336 | 336 |
337 void TestChangeTracker::OnWindowPredefinedCursorChanged( | 337 void TestChangeTracker::OnWindowPredefinedCursorChanged( |
338 Id window_id, | 338 Id window_id, |
339 mojom::Cursor cursor_id) { | 339 mojom::Cursor cursor_id) { |
340 Change change; | 340 Change change; |
341 change.type = CHANGE_TYPE_CURSOR_CHANGED; | 341 change.type = CHANGE_TYPE_CURSOR_CHANGED; |
342 change.window_id = window_id; | 342 change.window_id = window_id; |
343 change.cursor_id = cursor_id; | 343 change.cursor_id = static_cast<int32_t>(cursor_id); |
344 AddChange(change); | 344 AddChange(change); |
345 } | 345 } |
346 | 346 |
347 void TestChangeTracker::DelegateEmbed(const String& url) { | 347 void TestChangeTracker::DelegateEmbed(const String& url) { |
348 Change change; | 348 Change change; |
349 change.type = CHANGE_TYPE_DELEGATE_EMBED; | 349 change.type = CHANGE_TYPE_DELEGATE_EMBED; |
350 change.embed_url = url; | 350 change.embed_url = url; |
351 AddChange(change); | 351 AddChange(change); |
352 } | 352 } |
353 | 353 |
(...skipping 16 matching lines...) Expand all Loading... |
370 std::string TestWindow::ToString2() const { | 370 std::string TestWindow::ToString2() const { |
371 return base::StringPrintf( | 371 return base::StringPrintf( |
372 "window=%s parent=%s visible=%s drawn=%s", | 372 "window=%s parent=%s visible=%s drawn=%s", |
373 WindowIdToString(window_id).c_str(), WindowIdToString(parent_id).c_str(), | 373 WindowIdToString(window_id).c_str(), WindowIdToString(parent_id).c_str(), |
374 visible ? "true" : "false", drawn ? "true" : "false"); | 374 visible ? "true" : "false", drawn ? "true" : "false"); |
375 } | 375 } |
376 | 376 |
377 } // namespace ws | 377 } // namespace ws |
378 | 378 |
379 } // namespace mus | 379 } // namespace mus |
OLD | NEW |