| Index: content/browser/renderer_host/render_widget_host_view_mus.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mus.h b/content/browser/renderer_host/render_widget_host_view_mus.h
|
| index 9974e4100507d97dda90d76f15a58803e003bf62..8c80d95a19e5dde268c9fa3fcb40b71e1a118883 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mus.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mus.h
|
| @@ -6,7 +6,11 @@
|
| #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MUS_H_
|
|
|
| #include "base/macros.h"
|
| +#include "components/mus/public/cpp/scoped_window_ptr.h"
|
| +#include "components/mus/public/cpp/window.h"
|
| +#include "components/mus/public/interfaces/window_tree.mojom.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_base.h"
|
| +#include "content/public/browser/render_process_host_observer.h"
|
|
|
| namespace content {
|
|
|
| @@ -26,10 +30,15 @@ struct NativeWebKeyboardEvent;
|
| class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase {
|
| public:
|
| RenderWidgetHostViewMus(
|
| + mus::Window* parent_window,
|
| RenderWidgetHostImpl* widget,
|
| base::WeakPtr<RenderWidgetHostViewBase> platform_view);
|
| ~RenderWidgetHostViewMus() override;
|
|
|
| + void Embed(mus::mojom::WindowTreeClientPtr tree_client);
|
| +
|
| + RenderWidgetHostViewMus* AsMusView() override;
|
| +
|
| private:
|
| // RenderWidgetHostView implementation.
|
| void InitAsChild(gfx::NativeView parent_view) override;
|
| @@ -119,7 +128,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase {
|
| #endif
|
|
|
| RenderWidgetHostImpl* host_;
|
| - gfx::Size size_;
|
| + scoped_ptr<mus::ScopedWindowPtr> window_;
|
| // The platform view for this RenderWidgetHostView.
|
| // RenderWidgetHostViewMus mostly only cares about stuff related to
|
| // compositing, the rest are directly forwared to this |platform_view_|.
|
|
|