| Index: content/browser/web_contents/web_contents_view_mus.h
|
| diff --git a/content/browser/web_contents/web_contents_view_mus.h b/content/browser/web_contents/web_contents_view_mus.h
|
| index 173e6dd4ffe2469da41d1517de1e6ffaa8253f27..e39ebc5335664d6790f8b02bbf0d42409d65b717 100644
|
| --- a/content/browser/web_contents/web_contents_view_mus.h
|
| +++ b/content/browser/web_contents/web_contents_view_mus.h
|
| @@ -9,6 +9,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "components/mus/public/cpp/scoped_window_ptr.h"
|
| +#include "components/mus/public/cpp/window.h"
|
| #include "content/browser/renderer_host/render_view_host_delegate_view.h"
|
| #include "content/browser/web_contents/web_contents_view.h"
|
| #include "content/common/content_export.h"
|
| @@ -28,6 +30,7 @@ class WebContentsViewMus : public WebContentsView,
|
| // WebContentsViewMus always has a backing platform dependent view,
|
| // |platform_view|.
|
| WebContentsViewMus(WebContentsImpl* web_contents,
|
| + mus::Window* parent_window,
|
| scoped_ptr<WebContentsView> platform_view,
|
| RenderViewHostDelegateView** platform_view_delegate_view);
|
| ~WebContentsViewMus() override;
|
| @@ -80,10 +83,11 @@ class WebContentsViewMus : public WebContentsView,
|
| // The WebContentsImpl whose contents we display.
|
| WebContentsImpl* web_contents_;
|
|
|
| + scoped_ptr<mus::ScopedWindowPtr> window_;
|
| +
|
| // The platform dependent view backing this WebContentsView.
|
| // Calls to this WebContentsViewMus are forwarded to |platform_view_|.
|
| scoped_ptr<WebContentsView> platform_view_;
|
| - gfx::Size size_;
|
|
|
| // Delegate view for guest's platform view.
|
| RenderViewHostDelegateView* platform_view_delegate_view_;
|
|
|