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

Side by Side Diff: ui/aura/test/mus/test_window_tree.h

Issue 2710023007: Make WindowTree::SetModal() take the type. (Closed)
Patch Set: address feedback. 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 | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/test/mus/test_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ 5 #ifndef UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
6 #define UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ 6 #define UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 uint32_t window_id, 141 uint32_t window_id,
142 mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface, 142 mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
143 cc::mojom::MojoCompositorFrameSinkClientPtr client) override; 143 cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
144 void AddWindow(uint32_t change_id, uint32_t parent, uint32_t child) override; 144 void AddWindow(uint32_t change_id, uint32_t parent, uint32_t child) override;
145 void RemoveWindowFromParent(uint32_t change_id, uint32_t window_id) override; 145 void RemoveWindowFromParent(uint32_t change_id, uint32_t window_id) override;
146 void AddTransientWindow(uint32_t change_id, 146 void AddTransientWindow(uint32_t change_id,
147 uint32_t window_id, 147 uint32_t window_id,
148 uint32_t transient_window_id) override; 148 uint32_t transient_window_id) override;
149 void RemoveTransientWindowFromParent(uint32_t change_id, 149 void RemoveTransientWindowFromParent(uint32_t change_id,
150 uint32_t window_id) override; 150 uint32_t window_id) override;
151 void SetModal(uint32_t change_id, uint32_t window_id) override; 151 void SetModalType(uint32_t change_id,
152 uint32_t window_id,
153 ui::ModalType modal_type) override;
152 void ReorderWindow(uint32_t change_id, 154 void ReorderWindow(uint32_t change_id,
153 uint32_t window_id, 155 uint32_t window_id,
154 uint32_t relative_window_id, 156 uint32_t relative_window_id,
155 ui::mojom::OrderDirection direction) override; 157 ui::mojom::OrderDirection direction) override;
156 void GetWindowTree(uint32_t window_id, 158 void GetWindowTree(uint32_t window_id,
157 const GetWindowTreeCallback& callback) override; 159 const GetWindowTreeCallback& callback) override;
158 void SetCapture(uint32_t change_id, uint32_t window_id) override; 160 void SetCapture(uint32_t change_id, uint32_t window_id) override;
159 void ReleaseCapture(uint32_t change_id, uint32_t window_id) override; 161 void ReleaseCapture(uint32_t change_id, uint32_t window_id) override;
160 void StartPointerWatcher(bool want_moves) override; 162 void StartPointerWatcher(bool want_moves) override;
161 void StopPointerWatcher() override; 163 void StopPointerWatcher() override;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 gfx::Insets last_client_area_; 221 gfx::Insets last_client_area_;
220 222
221 base::Optional<gfx::Rect> last_hit_test_mask_; 223 base::Optional<gfx::Rect> last_hit_test_mask_;
222 224
223 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); 225 DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
224 }; 226 };
225 227
226 } // namespace aura 228 } // namespace aura
227 229
228 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ 230 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/test/mus/test_window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698