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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1461243002: [OLD ATTEMPT, DO NOT REVIEW] mustash: Enable connections to mus from the Chrome renderer Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Ben's comments 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/renderer/DEPS ('k') | content/renderer/render_widget_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index fb53fa455ee617115526282ee1fe7caadeb7ee12..257982aa5dfa6059fa98fa7116616b33e0b076b7 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -210,6 +210,11 @@
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
#endif
+#if defined(MOJO_SHELL_CLIENT)
+#include "content/public/common/mojo_shell_connection.h"
+#include "content/renderer/render_widget_mus.h"
+#endif // defined(MOJO_SHELL_CLIENT)
+
using blink::WebAXObject;
using blink::WebApplicationCacheHost;
using blink::WebApplicationCacheHostClient;
@@ -661,6 +666,13 @@ RenderViewImpl::RenderViewImpl(CompositorDependencies* compositor_deps,
void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
bool was_created_by_renderer) {
routing_id_ = params.view_id;
+#if defined(MOJO_SHELL_CLIENT)
+ if (routing_id_ && MojoShellConnection::Get() &&
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kUseMusInRenderer)) {
+ new RenderWidgetMus(routing_id_);
+ }
+#endif
int opener_view_routing_id;
WebFrame* opener_frame = RenderFrameImpl::ResolveOpener(
« no previous file with comments | « content/renderer/DEPS ('k') | content/renderer/render_widget_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698