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

Unified Diff: content/renderer/render_widget.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_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 1f221ad52aff96e84b0a4b0372567b4d3d7f7e19..de5db148225f2836bac37e11761fab4666e6705d 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -393,10 +393,7 @@ RenderWidget::RenderWidget(int32_t widget_routing_id,
render_widget_scheduling_state_->SetHidden(is_hidden_);
}
#if defined(USE_AURA)
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNoUseMusInRenderer)) {
- RendererWindowTreeClient::CreateIfNecessary(routing_id_);
- }
+ RendererWindowTreeClient::CreateIfNecessary(routing_id_);
#endif
}
@@ -407,13 +404,10 @@ RenderWidget::~RenderWidget() {
if (!is_swapped_out_ && RenderProcess::current())
RenderProcess::current()->ReleaseProcess();
#if defined(USE_AURA)
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNoUseMusInRenderer)) {
- // It is possible for a RenderWidget to be destroyed before it was embedded
- // in a mus window. The RendererWindowTreeClient will leak in such cases. So
- // explicitly delete it here.
- RendererWindowTreeClient::Destroy(routing_id_);
- }
+ // It is possible for a RenderWidget to be destroyed before it was embedded
+ // in a mus window. The RendererWindowTreeClient will leak in such cases. So
+ // explicitly delete it here.
+ RendererWindowTreeClient::Destroy(routing_id_);
#endif
}

Powered by Google App Engine
This is Rietveld 408576698