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

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

Issue 2745143004: Inform window manager about modal windows in mus+ash. (Closed)
Patch Set: rebased. Created 3 years, 9 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_tree.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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 return tree; 219 return tree;
220 } 220 }
221 221
222 // TestWindowManager ---------------------------------------------------------- 222 // TestWindowManager ----------------------------------------------------------
223 223
224 void TestWindowManager::WmDisplayRemoved(int64_t display_id) { 224 void TestWindowManager::WmDisplayRemoved(int64_t display_id) {
225 got_display_removed_ = true; 225 got_display_removed_ = true;
226 display_removed_id_ = display_id; 226 display_removed_id_ = display_id;
227 } 227 }
228 228
229 void TestWindowManager::WmSetModalType(uint32_t window_id, ui::ModalType type) {
230 on_set_modal_type_called_ = true;
231 }
232
229 void TestWindowManager::WmCreateTopLevelWindow( 233 void TestWindowManager::WmCreateTopLevelWindow(
230 uint32_t change_id, 234 uint32_t change_id,
231 ClientSpecificId requesting_client_id, 235 ClientSpecificId requesting_client_id,
232 const std::unordered_map<std::string, std::vector<uint8_t>>& properties) { 236 const std::unordered_map<std::string, std::vector<uint8_t>>& properties) {
233 got_create_top_level_window_ = true; 237 got_create_top_level_window_ = true;
234 change_id_ = change_id; 238 change_id_ = change_id;
235 } 239 }
236 240
237 void TestWindowManager::WmClientJankinessChanged(ClientSpecificId client_id, 241 void TestWindowManager::WmClientJankinessChanged(ClientSpecificId client_id,
238 bool janky) {} 242 bool janky) {}
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 if (!tree->AddWindow(parent_client_id, client_window_id)) 652 if (!tree->AddWindow(parent_client_id, client_window_id))
649 return nullptr; 653 return nullptr;
650 if (client_id) 654 if (client_id)
651 *client_id = client_window_id; 655 *client_id = client_window_id;
652 return tree->GetWindowByClientId(client_window_id); 656 return tree->GetWindowByClientId(client_window_id);
653 } 657 }
654 658
655 } // namespace test 659 } // namespace test
656 } // namespace ws 660 } // namespace ws
657 } // namespace ui 661 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/test_utils.h ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698