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

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

Issue 2456623002: Fixes to WindowTreeHostMus (Closed)
Patch Set: merge Created 4 years, 1 month 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_host_mus_delegate.h ('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 <set> 10 #include <set>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 // Same as AckSingleChangeOfType(), but doesn't fail if there is more than 61 // Same as AckSingleChangeOfType(), but doesn't fail if there is more than
62 // one change of the specified type. 62 // one change of the specified type.
63 bool AckFirstChangeOfType(WindowTreeChangeType type, bool result); 63 bool AckFirstChangeOfType(WindowTreeChangeType type, bool result);
64 64
65 void AckAllChangesOfType(WindowTreeChangeType type, bool result); 65 void AckAllChangesOfType(WindowTreeChangeType type, bool result);
66 66
67 bool GetAndRemoveFirstChangeOfType(WindowTreeChangeType type, 67 bool GetAndRemoveFirstChangeOfType(WindowTreeChangeType type,
68 uint32_t* change_id); 68 uint32_t* change_id);
69 69
70 size_t GetChangeCountForType(WindowTreeChangeType type);
71
70 private: 72 private:
71 struct Change { 73 struct Change {
72 WindowTreeChangeType type; 74 WindowTreeChangeType type;
73 uint32_t id; 75 uint32_t id;
74 }; 76 };
75 77
76 void OnChangeReceived( 78 void OnChangeReceived(
77 uint32_t change_id, 79 uint32_t change_id,
78 WindowTreeChangeType type = WindowTreeChangeType::OTHER); 80 WindowTreeChangeType type = WindowTreeChangeType::OTHER);
79 81
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 ui::mojom::WindowTreeClient* client_; 176 ui::mojom::WindowTreeClient* client_;
175 177
176 mojo::Map<mojo::String, mojo::Array<uint8_t>> last_new_window_properties_; 178 mojo::Map<mojo::String, mojo::Array<uint8_t>> last_new_window_properties_;
177 179
178 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); 180 DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
179 }; 181 };
180 182
181 } // namespace aura 183 } // namespace aura
182 184
183 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ 185 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_host_mus_delegate.h ('k') | ui/aura/test/mus/test_window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698