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

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

Issue 2617403003: Mus: Remove CompositorFrameSinkType (Closed)
Patch Set: Fix some unit tests Created 3 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 | « ui/aura/mus/window_tree_client.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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void SetWindowProperty( 132 void SetWindowProperty(
133 uint32_t change_id, 133 uint32_t change_id,
134 uint32_t window_id, 134 uint32_t window_id,
135 const std::string& name, 135 const std::string& name,
136 const base::Optional<std::vector<uint8_t>>& value) override; 136 const base::Optional<std::vector<uint8_t>>& value) override;
137 void SetWindowOpacity(uint32_t change_id, 137 void SetWindowOpacity(uint32_t change_id,
138 uint32_t window_id, 138 uint32_t window_id,
139 float opacity) override; 139 float opacity) override;
140 void AttachCompositorFrameSink( 140 void AttachCompositorFrameSink(
141 uint32_t window_id, 141 uint32_t window_id,
142 ui::mojom::CompositorFrameSinkType type,
143 mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface, 142 mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
144 cc::mojom::MojoCompositorFrameSinkClientPtr client) override; 143 cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
145 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;
146 void RemoveWindowFromParent(uint32_t change_id, uint32_t window_id) override; 145 void RemoveWindowFromParent(uint32_t change_id, uint32_t window_id) override;
147 void AddTransientWindow(uint32_t change_id, 146 void AddTransientWindow(uint32_t change_id,
148 uint32_t window_id, 147 uint32_t window_id,
149 uint32_t transient_window_id) override; 148 uint32_t transient_window_id) override;
150 void RemoveTransientWindowFromParent(uint32_t change_id, 149 void RemoveTransientWindowFromParent(uint32_t change_id,
151 uint32_t window_id) override; 150 uint32_t window_id) override;
152 void SetModal(uint32_t change_id, uint32_t window_id) override; 151 void SetModal(uint32_t change_id, uint32_t window_id) override;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 gfx::Insets last_client_area_; 214 gfx::Insets last_client_area_;
216 215
217 base::Optional<gfx::Rect> last_hit_test_mask_; 216 base::Optional<gfx::Rect> last_hit_test_mask_;
218 217
219 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); 218 DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
220 }; 219 };
221 220
222 } // namespace aura 221 } // namespace aura
223 222
224 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ 223 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.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