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

Index: chrome/browser/extensions/api/preference/preference_api.cc

diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc

index 50d279e2988ce38bf78bdf5fb260a812ad043b37..08c996c50ed2bef6f3b6b699d60cc1bd33eced23 100644

--- a/chrome/browser/extensions/api/preference/preference_api.cc

+++ b/chrome/browser/extensions/api/preference/preference_api.cc

@@ -20,11 +20,11 @@

#include "chrome/browser/prefs/pref_service.h"

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

#include "chrome/common/chrome_notification_types.h"

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

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

#include "chrome/common/pref_names.h"

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

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

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

namespace keys = extensions::preference_api_constants;

namespace helpers = extensions::preference_helpers;

@@ -282,7 +282,7 @@ void PreferenceEventRouter::OnPrefChanged(PrefServiceBase* pref_service,

transformer->BrowserToExtensionPref(pref->GetValue());

if (!transformed_value) {

LOG(ERROR) <<

- ExtensionErrorUtils::FormatErrorMessage(kConversionErrorMessage,

+ ErrorUtils::FormatErrorMessage(kConversionErrorMessage,

pref->name());

return;

}

@@ -312,7 +312,7 @@ bool PreferenceFunction::ValidateBrowserPref(

PrefMapping::GetInstance()->FindBrowserPrefForExtensionPref(

extension_pref_key, browser_pref_key, &permission));

if (!GetExtension()->HasAPIPermission(permission)) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(

+ error_ = ErrorUtils::FormatErrorMessage(

keys::kPermissionErrorMessage, extension_pref_key);

return false;

}

@@ -363,7 +363,7 @@ bool GetPreferenceFunction::RunImpl() {

transformer->BrowserToExtensionPref(pref->GetValue());

if (!transformed_value) {

LOG(ERROR) <<

- ExtensionErrorUtils::FormatErrorMessage(kConversionErrorMessage,

+ ErrorUtils::FormatErrorMessage(kConversionErrorMessage,

pref->name());

return false;

}

@@ -456,7 +456,7 @@ bool SetPreferenceFunction::RunImpl() {

scoped_ptr<Value> extensionPrefValue(

transformer->BrowserToExtensionPref(browser_pref_value.get()));

if (!extensionPrefValue) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(kConversionErrorMessage,

+ error_ = ErrorUtils::FormatErrorMessage(kConversionErrorMessage,

pref->name());

bad_message_ = true;

return false;