Chromium Code Reviews| 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..919be58e4520e55873ef8d5c0801dd3f04b905ee 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 { |
| @@ -23,13 +27,17 @@ struct NativeWebKeyboardEvent; |
| // such as visibility, and bounds. Some aspects such as input, focus, and cursor |
| // are managed by Mus directly. Input event routing will be plumbed directly to |
| // the renderer from Mus. |
| -class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase { |
| +class CONTENT_EXPORT RenderWidgetHostViewMus |
| + : public RenderWidgetHostViewBase { |
| public: |
| RenderWidgetHostViewMus( |
| + mus::Window* parent_window, |
| RenderWidgetHostImpl* widget, |
| base::WeakPtr<RenderWidgetHostViewBase> platform_view); |
| ~RenderWidgetHostViewMus() override; |
| + void EmbedWindowTreeClient(mus::mojom::WindowTreeClientPtr tree_client); |
| + |
| private: |
| // RenderWidgetHostView implementation. |
| void InitAsChild(gfx::NativeView parent_view) override; |
| @@ -119,7 +127,8 @@ class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase { |
| #endif |
| RenderWidgetHostImpl* host_; |
| - gfx::Size size_; |
| + scoped_ptr<mus::ScopedWindowPtr> window_; |
| + mus::mojom::WindowTreeClientPtr window_tree_client_; |
|
Fady Samuel
2015/11/24 04:42:38
Delete this.
|
| // The platform view for this RenderWidgetHostView. |
| // RenderWidgetHostViewMus mostly only cares about stuff related to |
| // compositing, the rest are directly forwared to this |platform_view_|. |