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

Side by Side Diff: ui/aura/mus/window_tree_client.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_port_mus.cc ('k') | ui/aura/mus/window_tree_client.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_MUS_WINDOW_TREE_CLIENT_H_ 5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // by kEmbedFlag*; 0 gives default behavior. |callback| is called to indicate 119 // by kEmbedFlag*; 0 gives default behavior. |callback| is called to indicate
120 // whether the embedding succeeded or failed and may be called immediately if 120 // whether the embedding succeeded or failed and may be called immediately if
121 // the embedding is known to fail. 121 // the embedding is known to fail.
122 void Embed(Window* window, 122 void Embed(Window* window,
123 ui::mojom::WindowTreeClientPtr client, 123 ui::mojom::WindowTreeClientPtr client,
124 uint32_t flags, 124 uint32_t flags,
125 const ui::mojom::WindowTree::EmbedCallback& callback); 125 const ui::mojom::WindowTree::EmbedCallback& callback);
126 126
127 void AttachCompositorFrameSink( 127 void AttachCompositorFrameSink(
128 Id window_id, 128 Id window_id,
129 ui::mojom::CompositorFrameSinkType type,
130 cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink, 129 cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
131 cc::mojom::MojoCompositorFrameSinkClientPtr client); 130 cc::mojom::MojoCompositorFrameSinkClientPtr client);
132 131
133 bool IsRoot(WindowMus* window) const { return roots_.count(window) > 0; } 132 bool IsRoot(WindowMus* window) const { return roots_.count(window) > 0; }
134 133
135 // Returns the root of this connection. 134 // Returns the root of this connection.
136 std::set<Window*> GetRoots(); 135 std::set<Window*> GetRoots();
137 136
138 // Returns true if the specified window was created by this client. 137 // Returns true if the specified window was created by this client.
139 bool WasCreatedByThisClient(const WindowMus* window) const; 138 bool WasCreatedByThisClient(const WindowMus* window) const;
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; 521 std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
523 522
524 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 523 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
525 524
526 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 525 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
527 }; 526 };
528 527
529 } // namespace aura 528 } // namespace aura
530 529
531 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 530 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_port_mus.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698