| 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 8ebae8cad50890e1fa0dec0ded36f41d4720d072..1bbd30eb6ab9ee1e42b0b2562523e0dd68fcde2f 100644
|
| --- a/chrome/browser/devtools/devtools_ui_bindings.cc
|
| +++ b/chrome/browser/devtools/devtools_ui_bindings.cc
|
| @@ -300,11 +300,9 @@ class DevToolsUIBindings::FrontendWebContentsObserver
|
| private:
|
| // contents::WebContentsObserver:
|
| void RenderProcessGone(base::TerminationStatus status) 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 DidStartNavigationToPendingEntry(
|
| + const GURL& url,
|
| + content::NavigationController::ReloadType reload_type) override;
|
| void DocumentOnLoadCompletedInMainFrame() override;
|
| void DidNavigateMainFrame(
|
| const content::LoadCommittedDetails& details,
|
| @@ -346,12 +344,11 @@ void DevToolsUIBindings::FrontendWebContentsObserver::RenderProcessGone(
|
| }
|
|
|
| void DevToolsUIBindings::FrontendWebContentsObserver::
|
| - AboutToNavigateRenderFrame(content::RenderFrameHost* old_host,
|
| - content::RenderFrameHost* new_host) {
|
| - if (new_host->GetParent())
|
| - return;
|
| + DidStartNavigationToPendingEntry(
|
| + const GURL& url,
|
| + content::NavigationController::ReloadType reload_type) {
|
| devtools_bindings_->frontend_host_.reset(
|
| - content::DevToolsFrontendHost::Create(new_host,
|
| + content::DevToolsFrontendHost::Create(web_contents()->GetMainFrame(),
|
| devtools_bindings_));
|
| }
|
|
|
|
|