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

Unified Diff: chrome/browser/devtools/devtools_ui_bindings.cc

Issue 1369413002: Revert of [DevTools] Do not use AboutToNavigateRenderFrame in DevToolsUIBindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698