chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc - Issue 325443002: Move about://-related constants from //content to //url

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Android ifx Created 6 years, 6 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 | « chrome/browser/extensions/api/tabs/tabs_test.cc ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

index c322615c986f0559cd8e78e34fd4c31ec7fa16bf..becb1ab1b2c5c696da45e8bea708094b52ff2afb 100644

--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

@@ -81,7 +81,7 @@ bool FrameNavigationState::IsValidUrl(const GURL& url) const {

return true;

}

// Allow about:blank and about:srcdoc.

- if (url.spec() == content::kAboutBlankURL ||

+ if (url.spec() == url::kAboutBlankURL ||

url.spec() == content::kAboutSrcDocURL) {

return true;

}

@@ -101,7 +101,7 @@ void FrameNavigationState::TrackFrame(FrameID frame_id,

frame_state.url = url;

frame_state.is_main_frame = is_main_frame;

frame_state.is_iframe_srcdoc = is_iframe_srcdoc;

- DCHECK(!is_iframe_srcdoc || url == GURL(content::kAboutBlankURL));

+ DCHECK(!is_iframe_srcdoc || url == GURL(url::kAboutBlankURL));

frame_state.is_navigating = true;

frame_state.is_committed = false;

frame_state.is_server_redirected = false;