chrome/browser/extensions/api/web_request/web_request_api_helpers.cc - Issue 273193004: 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_request/web_request_api_helpers.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing files. 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/web_navigation/frame_navigation_state.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_request/web_request_api_helpers.cc

diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc

index 1c620811fd7c826b1ccbac2124387dcc3aaf7567..5e24399ccb9e37e327bd775bc1817cec0184377c 100644

--- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc

+++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc

@@ -17,7 +17,6 @@

#include "chrome/browser/extensions/extension_warning_set.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/renderer_host/web_cache_manager.h"

-#include "chrome/common/url_constants.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_process_host.h"

#include "extensions/browser/extension_system.h"

@@ -27,6 +26,7 @@

#include "net/cookies/parsed_cookie.h"

#include "net/http/http_util.h"

#include "net/url_request/url_request.h"

+#include "url/url_constants.h"

// TODO(battre): move all static functions into an anonymous namespace at the

// top of this file.

@@ -427,7 +427,7 @@ static bool MergeRedirectUrlOfResponsesHelper(

if ((*delta)->new_url.is_empty())

continue;

if (consider_only_cancel_scheme_urls &&

- !(*delta)->new_url.SchemeIs(content::kDataScheme) &&

+ !(*delta)->new_url.SchemeIs(url::kDataScheme) &&

(*delta)->new_url.spec() != "about:blank") {

continue;

}