| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 2141f47944ee52b0a6335879a24630103e78ca7f..16f9360e698dee594ca5bf514177aed31c5c26f1 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -1945,25 +1945,19 @@ void RenderFrameImpl::didCommitProvisionalLoad(
|
| render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
|
| }
|
|
|
| -void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame,
|
| - int world_id) {
|
| +void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame) {
|
| DCHECK(!frame_ || frame_ == frame);
|
| // TODO(nasko): Move implementation here. Needed state:
|
| // * enabled_bindings_
|
| // * dom_automation_controller_
|
| // * stats_collection_controller_
|
|
|
| - render_view_->didClearWindowObject(frame, world_id);
|
| -
|
| - // Only install controllers into the main world.
|
| - if (world_id)
|
| - return;
|
| + render_view_->didClearWindowObject(frame);
|
|
|
| if (render_view_->GetEnabledBindings() & BINDINGS_POLICY_DOM_AUTOMATION)
|
| DomAutomationController::Install(this, frame);
|
|
|
| - FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
|
| - DidClearWindowObject(world_id));
|
| + FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidClearWindowObject());
|
| }
|
|
|
| void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
|
|
|