content/browser/renderer_host/render_widget_host_view_mus.h - Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_mus.h

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't create a RenderWidgetWindowTreeeClientFactory in tests Created 5 years, 1 month 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 | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/renderer_host/render_widget_host_view_mus.cc » ('j') | content/common/render_widget_window_tree_client_factory.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..d3ae71dce189cdf5d5ba7501f8a26a658c1b57a2 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,10 @@

#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 "content/browser/renderer_host/render_widget_host_view_base.h"

+#include "content/public/browser/render_process_host_observer.h"

namespace content {

@@ -26,6 +29,7 @@ struct NativeWebKeyboardEvent;

class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase {

public:

RenderWidgetHostViewMus(

+ mus::Window* parent_window,

RenderWidgetHostImpl* widget,

base::WeakPtr<RenderWidgetHostViewBase> platform_view);

~RenderWidgetHostViewMus() override;

@@ -119,6 +123,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase {

#endif

RenderWidgetHostImpl* host_;

+ scoped_ptr<mus::ScopedWindowPtr> window_;

gfx::Size size_;

// The platform view for this RenderWidgetHostView.

// RenderWidgetHostViewMus mostly only cares about stuff related to