chrome/browser/extensions/api/content_settings/content_settings_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/content_settings/content_settings_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/browsing_data/browsing_data_api.cc ('k') | chrome/browser/extensions/api/context_menu/context_menu_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index ce001caa5529545df7acdaefaa7a44e7a6aa1278..9357bcc4e4a318c6555722d4d18be47bc1f3f91b 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -25,8 +25,8 @@

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

#include "chrome/common/chrome_switches.h"

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

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

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

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

using content::BrowserThread;

using content::PluginService;

@@ -104,7 +104,7 @@ bool GetContentSettingFunction::RunImpl() {

GURL primary_url(params->details.primary_url);

if (!primary_url.is_valid()) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kInvalidUrlError,

+ error_ = ErrorUtils::FormatErrorMessage(keys::kInvalidUrlError,

params->details.primary_url);

return false;

}

@@ -113,7 +113,7 @@ bool GetContentSettingFunction::RunImpl() {

if (params->details.secondary_url.get()) {

secondary_url = GURL(*params->details.secondary_url);

if (!secondary_url.is_valid()) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kInvalidUrlError,

+ error_ = ErrorUtils::FormatErrorMessage(keys::kInvalidUrlError,

*params->details.secondary_url);

return false;

}