chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc - Issue 254763005: Move some content url constants 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 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 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/cookies/cookies_helpers.cc ('k') | chrome/browser/extensions/api/web_request/web_request_permissions.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 83562214c456526724909fb57112228a93827a72..9cd4349ede7eff02f8cf386f9d4c2228bf7e87ba 100644

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

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

@@ -14,14 +14,14 @@ namespace {

// URL schemes for which we'll send events.

const char* kValidSchemes[] = {

- content::kChromeUIScheme,

- content::kHttpScheme,

- content::kHttpsScheme,

- content::kFileScheme,

- content::kFtpScheme,

- content::kJavaScriptScheme,

- content::kDataScheme,

- content::kFileSystemScheme,

+ content::kChromeUIScheme,

+ url::kHttpScheme,

+ url::kHttpsScheme,

+ content::kFileScheme,

+ content::kFtpScheme,

+ content::kJavaScriptScheme,

+ content::kDataScheme,

+ content::kFileSystemScheme,

};

} // namespace