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

Unified Diff: ui/aura/test/mus/test_window_tree.h

Issue 2456843004: Wires up transient windows for aura-mus (Closed)
Patch Set: relative to master Created 4 years, 2 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/mus/test_window_tree.h
diff --git a/ui/aura/test/mus/test_window_tree.h b/ui/aura/test/mus/test_window_tree.h
index ce6f7ec622501c36444e0e34da88004bb6ade589..f9998aaf6649795632a5ba0d5c97adc0297c5355 100644
--- a/ui/aura/test/mus/test_window_tree.h
+++ b/ui/aura/test/mus/test_window_tree.h
@@ -11,10 +11,12 @@
#include "base/macros.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
+#include "ui/aura/mus/mus_types.h"
namespace aura {
enum class WindowTreeChangeType {
+ ADD_TRANSIENT,
BOUNDS,
// Used for both set and release capture.
CAPTURE,
@@ -23,12 +25,18 @@ enum class WindowTreeChangeType {
NEW_TOP_LEVEL,
NEW_WINDOW,
PROPERTY,
+ REMOVE_TRANSIENT,
VISIBLE,
// This covers all cases that aren't used in tests.
OTHER,
};
+struct TransientData {
+ Id parent_id;
+ Id child_id;
+};
+
// WindowTree implementation for tests. TestWindowTree maintains a list of all
// calls that take a change_id and are expected to be acked back to the client.
// Various functions are provided to respond to the changes.
@@ -69,6 +77,9 @@ class TestWindowTree : public ui::mojom::WindowTree {
size_t GetChangeCountForType(WindowTreeChangeType type);
+ // Data from the most recently added/removed transient window.
+ const TransientData& transient_data() const { return transient_data_; }
+
private:
struct Change {
WindowTreeChangeType type;
@@ -177,6 +188,8 @@ class TestWindowTree : public ui::mojom::WindowTree {
mojo::Map<mojo::String, mojo::Array<uint8_t>> last_new_window_properties_;
+ TransientData transient_data_;
+
DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
};
« 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