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

Side by Side Diff: components/mus/ws/test_change_tracker.cc

Issue 1568263003: Changes top level window creation to include window state in callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn Created 4 years, 11 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
« no previous file with comments | « components/mus/ws/test_change_tracker.h ('k') | components/mus/ws/window_tree_apptest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 WindowIdToString(change.window_id).c_str()); 112 WindowIdToString(change.window_id).c_str());
113 113
114 case CHANGE_TYPE_CURSOR_CHANGED: 114 case CHANGE_TYPE_CURSOR_CHANGED:
115 return base::StringPrintf("CursorChanged id=%s cursor_id=%d", 115 return base::StringPrintf("CursorChanged id=%s cursor_id=%d",
116 WindowIdToString(change.window_id).c_str(), 116 WindowIdToString(change.window_id).c_str(),
117 change.cursor_id); 117 change.cursor_id);
118 case CHANGE_TYPE_ON_CHANGE_COMPLETED: 118 case CHANGE_TYPE_ON_CHANGE_COMPLETED:
119 return base::StringPrintf("ChangeCompleted id=%d sucess=%s", 119 return base::StringPrintf("ChangeCompleted id=%d sucess=%s",
120 change.change_id, 120 change.change_id,
121 change.bool_value ? "true" : "false"); 121 change.bool_value ? "true" : "false");
122
123 case CHANGE_TYPE_ON_TOP_LEVEL_CREATED:
124 return base::StringPrintf("TopLevelCreated id=%d window_id=%s",
125 change.change_id,
126 WindowIdToString(change.window_id).c_str());
122 } 127 }
123 return std::string(); 128 return std::string();
124 } 129 }
125 130
126 } // namespace 131 } // namespace
127 132
128 std::vector<std::string> ChangesToDescription1( 133 std::vector<std::string> ChangesToDescription1(
129 const std::vector<Change>& changes) { 134 const std::vector<Change>& changes) {
130 std::vector<std::string> strings(changes.size()); 135 std::vector<std::string> strings(changes.size());
131 for (size_t i = 0; i < changes.size(); ++i) 136 for (size_t i = 0; i < changes.size(); ++i)
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } 353 }
349 354
350 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) { 355 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) {
351 Change change; 356 Change change;
352 change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED; 357 change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED;
353 change.change_id = change_id; 358 change.change_id = change_id;
354 change.bool_value = success; 359 change.bool_value = success;
355 AddChange(change); 360 AddChange(change);
356 } 361 }
357 362
363 void TestChangeTracker::OnTopLevelCreated(uint32_t change_id,
364 mojom::WindowDataPtr window_data) {
365 Change change;
366 change.type = CHANGE_TYPE_ON_TOP_LEVEL_CREATED;
367 change.change_id = change_id;
368 change.window_id = window_data->window_id;
369 AddChange(change);
370 }
371
358 void TestChangeTracker::AddChange(const Change& change) { 372 void TestChangeTracker::AddChange(const Change& change) {
359 changes_.push_back(change); 373 changes_.push_back(change);
360 if (delegate_) 374 if (delegate_)
361 delegate_->OnChangeAdded(); 375 delegate_->OnChangeAdded();
362 } 376 }
363 377
364 TestWindow::TestWindow() {} 378 TestWindow::TestWindow() {}
365 379
366 TestWindow::~TestWindow() {} 380 TestWindow::~TestWindow() {}
367 381
368 std::string TestWindow::ToString() const { 382 std::string TestWindow::ToString() const {
369 return base::StringPrintf("window=%s parent=%s", 383 return base::StringPrintf("window=%s parent=%s",
370 WindowIdToString(window_id).c_str(), 384 WindowIdToString(window_id).c_str(),
371 WindowIdToString(parent_id).c_str()); 385 WindowIdToString(parent_id).c_str());
372 } 386 }
373 387
374 std::string TestWindow::ToString2() const { 388 std::string TestWindow::ToString2() const {
375 return base::StringPrintf( 389 return base::StringPrintf(
376 "window=%s parent=%s visible=%s drawn=%s", 390 "window=%s parent=%s visible=%s drawn=%s",
377 WindowIdToString(window_id).c_str(), WindowIdToString(parent_id).c_str(), 391 WindowIdToString(window_id).c_str(), WindowIdToString(parent_id).c_str(),
378 visible ? "true" : "false", drawn ? "true" : "false"); 392 visible ? "true" : "false", drawn ? "true" : "false");
379 } 393 }
380 394
381 } // namespace ws 395 } // namespace ws
382 396
383 } // namespace mus 397 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/ws/test_change_tracker.h ('k') | components/mus/ws/window_tree_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698