chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc - Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..."

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 328713006: Merge 275988 "Move about://-related constants from //content to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2042/src/

Patch Set: 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

===================================================================

--- chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc (revision 276109)

+++ chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc (working copy)

@@ -81,7 +81,7 @@

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 @@

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;