chrome/browser/extensions/api/web_request/web_request_api.cc - Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into

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.cc

Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: hate Created 8 years, 1 month 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_request/web_request_api.h ('k') | chrome/browser/extensions/api/webstore_private/webstore_private_api.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.cc

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

index 401f5ae8db687a87171d5eaba970cc3e9869fd7c..d0c6c9adee838719fb60c40e6afd0e39e4019211 100644

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

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

@@ -39,7 +39,6 @@

#include "chrome/common/extensions/event_filtering_info.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

-#include "chrome/common/extensions/extension_error_utils.h"

#include "chrome/common/extensions/extension_messages.h"

#include "chrome/common/extensions/features/feature.h"

#include "chrome/common/url_constants.h"

@@ -47,6 +46,7 @@

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

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

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

+#include "extensions/common/error_utils.h"

#include "extensions/common/url_pattern.h"

#include "googleurl/src/gurl.h"

#include "grit/generated_resources.h"

@@ -65,6 +65,7 @@ using chrome::VersionInfo;

using content::BrowserMessageFilter;

using content::BrowserThread;

using content::ResourceRequestInfo;

+using extensions::ErrorUtils;

using extensions::Extension;

using extensions::ExtensionWarning;

using extensions::ExtensionWarningService;

@@ -417,7 +418,7 @@ bool ExtensionWebRequestEventRouter::RequestFilter::InitFromValue(

URLPattern::SCHEME_EXTENSION);

if (!urls_value->GetString(i, &url) ||

pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {

- *error = ExtensionErrorUtils::FormatErrorMessage(

+ *error = ErrorUtils::FormatErrorMessage(

keys::kInvalidRequestFilterUrl, url);

return false;

}

@@ -1793,7 +1794,7 @@ bool WebRequestEventHandled::RunImpl() {

&new_url_str));

response->new_url = GURL(new_url_str);

if (!response->new_url.is_valid()) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(

+ error_ = ErrorUtils::FormatErrorMessage(

keys::kInvalidRedirectUrl, new_url_str);

return false;

}