chrome/browser/extensions/api/permissions/permissions_api_helpers.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/permissions/permissions_api_helpers.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/permissions/permissions_api.cc ('k') | chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/permissions/permissions_api_helpers.cc

diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc

index d637c9987183bf3556c478aa352d3f7c5ee02057..f537a910171571ecfae32ee879a4b18724a0ba85 100644

--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc

+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc

@@ -7,10 +7,10 @@

#include "base/values.h"

#include "chrome/common/extensions/api/permissions.h"

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

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

#include "chrome/common/extensions/permissions/permission_set.h"

#include "chrome/common/extensions/permissions/permissions_info.h"

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

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

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

using extensions::APIPermission;

using extensions::PermissionSet;

@@ -58,7 +58,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet(

it != permissions_list->end(); ++it) {

const APIPermissionInfo* permission_info = info->GetByName(*it);

if (!permission_info) {

- *error = ExtensionErrorUtils::FormatErrorMessage(

+ *error = ErrorUtils::FormatErrorMessage(

kUnknownPermissionError, *it);

return NULL;

}

@@ -73,7 +73,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet(

URLPattern origin(Extension::kValidHostPermissionSchemes);

URLPattern::ParseResult parse_result = origin.Parse(*it);

if (URLPattern::PARSE_SUCCESS != parse_result) {

- *error = ExtensionErrorUtils::FormatErrorMessage(

+ *error = ErrorUtils::FormatErrorMessage(

kInvalidOrigin,

*it,

URLPattern::GetParseResultString(parse_result));