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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 665993002: ChannelMojo: Add ChannelMojo::CanBeUsed() to enable it incrementally (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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') | ipc/mojo/ipc_channel_mojo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 409f0fe6b36d2787620575416179e2819f6ee8a9..b9fd1826127a5ab937811bdb1913975da7eb17bf 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -98,6 +98,7 @@
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_forwarding_message_filter.h"
#include "ipc/ipc_platform_file.h"
+#include "ipc/mojo/ipc_channel_mojo.h"
#include "media/base/audio_hardware_config.h"
#include "media/base/media.h"
#include "media/filters/gpu_video_accelerator_factories.h"
@@ -314,7 +315,8 @@ void CreateRenderFrameSetup(mojo::InterfaceRequest<RenderFrameSetup> request) {
bool ShouldUseMojoChannel() {
return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableRendererMojoChannel);
+ switches::kEnableRendererMojoChannel) ||
+ IPC::ChannelMojo::ShouldBeUsed();
}
blink::WebGraphicsContext3D::Attributes GetOffscreenAttribs() {
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | ipc/mojo/ipc_channel_mojo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698