| Index: chrome/browser/devtools/devtools_ui_bindings.cc
|
| diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
|
| index 43348883acbff49dfccea16be6c58b5a3a1c3218..8ebae8cad50890e1fa0dec0ded36f41d4720d072 100644
|
| --- a/chrome/browser/devtools/devtools_ui_bindings.cc
|
| +++ b/chrome/browser/devtools/devtools_ui_bindings.cc
|
| @@ -300,11 +300,11 @@
|
| private:
|
| // contents::WebContentsObserver:
|
| void RenderProcessGone(base::TerminationStatus status) override;
|
| - void DidStartProvisionalLoadForFrame(
|
| - content::RenderFrameHost* render_frame_host,
|
| - const GURL& validated_url,
|
| - bool is_error_page,
|
| - bool is_iframe_srcdoc) override;
|
| + // TODO(creis): Replace with RenderFrameCreated when http://crbug.com/425397
|
| + // is fixed. See also http://crbug.com/424641.
|
| + void AboutToNavigateRenderFrame(
|
| + content::RenderFrameHost* old_host,
|
| + content::RenderFrameHost* new_host) override;
|
| void DocumentOnLoadCompletedInMainFrame() override;
|
| void DidNavigateMainFrame(
|
| const content::LoadCommittedDetails& details,
|
| @@ -346,14 +346,12 @@
|
| }
|
|
|
| void DevToolsUIBindings::FrontendWebContentsObserver::
|
| - DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host,
|
| - const GURL& validated_url,
|
| - bool is_error_page,
|
| - bool is_iframe_srcdoc) {
|
| - if (render_frame_host->GetParent())
|
| + AboutToNavigateRenderFrame(content::RenderFrameHost* old_host,
|
| + content::RenderFrameHost* new_host) {
|
| + if (new_host->GetParent())
|
| return;
|
| devtools_bindings_->frontend_host_.reset(
|
| - content::DevToolsFrontendHost::Create(render_frame_host,
|
| + content::DevToolsFrontendHost::Create(new_host,
|
| devtools_bindings_));
|
| }
|
|
|
|
|