Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 02ed7244a4193f196df38a3488c8926478ece467..bc7a37215b6563d300d87809fe50db48aebac33b 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -777,10 +777,13 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
// The next group of objects all implement RenderViewObserver, so are deleted |
// along with the RenderView automatically. |
- devtools_agent_ = new DevToolsAgent(main_render_frame_.get()); |
- if (RenderWidgetCompositor* rwc = compositor()) { |
- webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); |
+ if (!proxy) |
+ devtools_agent_ = new DevToolsAgent(main_render_frame_.get()); |
+ if (webview()->devToolsAgent()) { |
pfeldman
2015/03/23 12:49:44
Place to under the if above.
dgozman
2015/03/23 13:28:26
Done.
|
+ if (RenderWidgetCompositor* rwc = compositor()) |
+ webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); |
} |
+ |
mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); |
history_controller_.reset(new HistoryController(this)); |