Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2536)

Unified Diff: chrome/browser/extensions/api/cookies/cookies_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
Index: chrome/browser/extensions/api/cookies/cookies_api.cc
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index 0d9ac3818fadcd872eb1467456c6058faeeae4ab..11d228b865bed5022024370d08b7f750a320f3bc 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -24,9 +24,9 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/api/cookies.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_error_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
+#include "extensions/common/error_utils.h"
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_monster.h"
#include "net/url_request/url_request_context.h"
@@ -140,13 +140,13 @@ bool CookiesFunction::ParseUrl(const std::string& url_string, GURL* url,
bool check_host_permissions) {
*url = GURL(url_string);
if (!url->is_valid()) {
- error_ = ExtensionErrorUtils::FormatErrorMessage(
+ error_ = ErrorUtils::FormatErrorMessage(
keys::kInvalidUrlError, url_string);
return false;
}
// Check against host permissions if needed.
if (check_host_permissions && !GetExtension()->HasHostPermission(*url)) {
- error_ = ExtensionErrorUtils::FormatErrorMessage(
+ error_ = ErrorUtils::FormatErrorMessage(
keys::kNoHostPermissionsError, url->spec());
return false;
}
@@ -162,7 +162,7 @@ bool CookiesFunction::ParseStoreContext(
store_profile = cookies_helpers::ChooseProfileFromStoreId(
*store_id, profile(), include_incognito());
if (!store_profile) {
- error_ = ExtensionErrorUtils::FormatErrorMessage(
+ error_ = ErrorUtils::FormatErrorMessage(
keys::kInvalidStoreIdError, *store_id);
return false;
}
@@ -423,7 +423,7 @@ void SetCookieFunction::RespondOnUIThread() {
if (!success_) {
std::string name = parsed_args_->details.name.get() ?
*parsed_args_->details.name : "";
- error_ = ExtensionErrorUtils::FormatErrorMessage(
+ error_ = ErrorUtils::FormatErrorMessage(
keys::kCookieSetFailedError, name);
}
SendResponse(success_);
« no previous file with comments | « chrome/browser/extensions/api/context_menu/context_menu_api.cc ('k') | chrome/browser/extensions/api/debugger/debugger_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698