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

Unified Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)
Patch Set: Fixed test compilation error Created 4 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
Index: content/browser/devtools/render_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index 04cede818c6fe7e20c52fd67dc8f8a3c969f8a2e..97a0b3d4f07b0cedac148c1bd56dde5f1eef8e2d 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -562,8 +562,8 @@ RenderFrameDevToolsAgentHost::~RenderFrameDevToolsAgentHost() {
void RenderFrameDevToolsAgentHost::ReadyToCommitNavigation(
NavigationHandle* navigation_handle) {
- // ReadyToCommitNavigation should only be called in PlzNavigate.
- DCHECK(IsBrowserSideNavigationEnabled());
+ if (!IsBrowserSideNavigationEnabled())
+ return;
// If the navigation is not tracked, return;
if (navigating_handles_.count(navigation_handle) == 0)

Powered by Google App Engine
This is Rietveld 408576698