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

Side by Side Diff: ui/aura/mus/window_port_mus.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/mus_context_factory.cc ('k') | ui/aura/mus/window_port_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_PORT_MUS_H_ 5 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_
6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 ui::mojom::Cursor predefined_cursor() const { return predefined_cursor_; } 56 ui::mojom::Cursor predefined_cursor() const { return predefined_cursor_; }
57 void SetPredefinedCursor(ui::mojom::Cursor cursor_id); 57 void SetPredefinedCursor(ui::mojom::Cursor cursor_id);
58 58
59 // Embeds a new client in this Window. See WindowTreeClient::Embed() for 59 // Embeds a new client in this Window. See WindowTreeClient::Embed() for
60 // details on arguments. 60 // details on arguments.
61 void Embed(ui::mojom::WindowTreeClientPtr client, 61 void Embed(ui::mojom::WindowTreeClientPtr client,
62 uint32_t flags, 62 uint32_t flags,
63 const ui::mojom::WindowTree::EmbedCallback& callback); 63 const ui::mojom::WindowTree::EmbedCallback& callback);
64 64
65 std::unique_ptr<WindowCompositorFrameSink> RequestCompositorFrameSink( 65 std::unique_ptr<WindowCompositorFrameSink> RequestCompositorFrameSink(
66 ui::mojom::CompositorFrameSinkType type,
67 scoped_refptr<cc::ContextProvider> context_provider, 66 scoped_refptr<cc::ContextProvider> context_provider,
68 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager); 67 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
69 68
70 void AttachCompositorFrameSink( 69 void AttachCompositorFrameSink(
71 ui::mojom::CompositorFrameSinkType type,
72 std::unique_ptr<WindowCompositorFrameSinkBinding> 70 std::unique_ptr<WindowCompositorFrameSinkBinding>
73 compositor_frame_sink_binding); 71 compositor_frame_sink_binding);
74 72
75 private: 73 private:
76 friend class WindowPortMusTestApi; 74 friend class WindowPortMusTestApi;
77 friend class WindowTreeClient; 75 friend class WindowTreeClient;
78 friend class WindowTreeClientPrivate; 76 friend class WindowTreeClientPrivate;
79 friend class WindowTreeHostMus; 77 friend class WindowTreeHostMus;
80 78
81 using ServerChangeIdType = uint8_t; 79 using ServerChangeIdType = uint8_t;
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 cc::SurfaceInfo surface_info_; 246 cc::SurfaceInfo surface_info_;
249 247
250 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; 248 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
251 249
252 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); 250 DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
253 }; 251 };
254 252
255 } // namespace aura 253 } // namespace aura
256 254
257 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ 255 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/mus_context_factory.cc ('k') | ui/aura/mus/window_port_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698