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

Side by Side Diff: services/ui/ws/test_utils.cc

Issue 2346253004: Makes display roots be destroyed by client (Closed)
Patch Set: cleanup Created 4 years, 3 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 | « services/ui/ws/test_utils.h ('k') | services/ui/ws/window_manager_client_unittest.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "services/ui/ws/test_utils.h" 5 #include "services/ui/ws/test_utils.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "cc/output/copy_output_request.h" 10 #include "cc/output/copy_output_request.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 const uint32_t embed_flags = 0; 192 const uint32_t embed_flags = 0;
193 WindowTree* tree = window_server_->EmbedAtWindow( 193 WindowTree* tree = window_server_->EmbedAtWindow(
194 root, shell::mojom::kRootUserID, ui::mojom::WindowTreeClientPtr(), 194 root, shell::mojom::kRootUserID, ui::mojom::WindowTreeClientPtr(),
195 embed_flags, base::WrapUnique(new WindowManagerAccessPolicy)); 195 embed_flags, base::WrapUnique(new WindowManagerAccessPolicy));
196 tree->ConfigureWindowManager(); 196 tree->ConfigureWindowManager();
197 return tree; 197 return tree;
198 } 198 }
199 199
200 // TestWindowManager ---------------------------------------------------------- 200 // TestWindowManager ----------------------------------------------------------
201 201
202 void TestWindowManager::WmDisplayRemoved(int64_t display_id) {
203 got_display_removed_ = true;
204 display_removed_id_ = display_id;
205 }
206
202 void TestWindowManager::WmCreateTopLevelWindow( 207 void TestWindowManager::WmCreateTopLevelWindow(
203 uint32_t change_id, 208 uint32_t change_id,
204 ClientSpecificId requesting_client_id, 209 ClientSpecificId requesting_client_id,
205 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) { 210 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) {
206 got_create_top_level_window_ = true; 211 got_create_top_level_window_ = true;
207 change_id_ = change_id; 212 change_id_ = change_id;
208 } 213 }
209 214
210 void TestWindowManager::WmClientJankinessChanged(ClientSpecificId client_id, 215 void TestWindowManager::WmClientJankinessChanged(ClientSpecificId client_id,
211 bool janky) {} 216 bool janky) {}
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 return nullptr; 584 return nullptr;
580 if (!tree->AddWindow(parent_client_id, client_window_id)) 585 if (!tree->AddWindow(parent_client_id, client_window_id))
581 return nullptr; 586 return nullptr;
582 *client_id = client_window_id; 587 *client_id = client_window_id;
583 return tree->GetWindowByClientId(client_window_id); 588 return tree->GetWindowByClientId(client_window_id);
584 } 589 }
585 590
586 } // namespace test 591 } // namespace test
587 } // namespace ws 592 } // namespace ws
588 } // namespace ui 593 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/test_utils.h ('k') | services/ui/ws/window_manager_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698