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

Unified Diff: ui/aura/mus/window_port_mus.h

Issue 2647363002: mus: Remove aura version of WindowCompositorFrameSink. (Closed)
Patch Set: tot merge 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/mus/window_compositor_frame_sink.cc ('k') | ui/aura/mus/window_port_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_port_mus.h
diff --git a/ui/aura/mus/window_port_mus.h b/ui/aura/mus/window_port_mus.h
index 084e9d539b2b6832e163bf5b9bb633653d7a883d..21ec687c2d36cf661a27b1d6bc8a0f499e204e50 100644
--- a/ui/aura/mus/window_port_mus.h
+++ b/ui/aura/mus/window_port_mus.h
@@ -13,12 +13,12 @@
#include "base/logging.h"
#include "base/macros.h"
#include "cc/surfaces/surface_info.h"
+#include "services/ui/public/cpp/window_compositor_frame_sink.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
#include "ui/aura/aura_export.h"
#include "ui/aura/mus/mus_types.h"
-#include "ui/aura/mus/window_compositor_frame_sink.h"
#include "ui/aura/mus/window_mus.h"
#include "ui/aura/window_port.h"
#include "ui/gfx/geometry/rect.h"
@@ -62,12 +62,12 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
uint32_t flags,
const ui::mojom::WindowTree::EmbedCallback& callback);
- std::unique_ptr<WindowCompositorFrameSink> RequestCompositorFrameSink(
+ std::unique_ptr<ui::WindowCompositorFrameSink> RequestCompositorFrameSink(
scoped_refptr<cc::ContextProvider> context_provider,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
void AttachCompositorFrameSink(
- std::unique_ptr<WindowCompositorFrameSinkBinding>
+ std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
compositor_frame_sink_binding);
private:
« no previous file with comments | « ui/aura/mus/window_compositor_frame_sink.cc ('k') | ui/aura/mus/window_port_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698