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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 2762873002: Remove --no-use-mus-in-renderer (Closed)
Patch Set: Created 3 years, 9 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
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index d360a7f5af8ac94717bde56ed129aa448059c501..951c1af74ccd8cc874c0f76414341541214b9da0 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -708,9 +708,7 @@ void RenderThreadImpl::Init(
AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter());
#if defined(USE_AURA)
- if (IsRunningInMash() &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNoUseMusInRenderer)) {
+ if (IsRunningInMash()) {
CreateRenderWidgetWindowTreeClientFactory(GetServiceManagerConnection());
}
#endif
@@ -1883,8 +1881,7 @@ void RenderThreadImpl::RequestNewCompositorFrameSink(
use_software = true;
#if defined(USE_AURA)
- if (!use_software && IsRunningInMash() &&
- !command_line.HasSwitch(switches::kNoUseMusInRenderer)) {
+ if (!use_software && IsRunningInMash()) {
scoped_refptr<gpu::GpuChannelHost> channel = EstablishGpuChannelSync();
// If the channel could not be established correctly, then return null. This
// would cause the compositor to wait and try again at a later time.

Powered by Google App Engine
This is Rietveld 408576698