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

Unified Diff: chrome/browser/extensions/api/processes/processes_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/processes/processes_api.cc
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc
index f934a0cfacda4c809588807c84de92f93fffccc7..c2b2f7fb868bd7f0d82c06936d926d45a83e56f4 100644
--- a/chrome/browser/extensions/api/processes/processes_api.cc
+++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -23,7 +23,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension_error_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
@@ -34,6 +33,7 @@
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/result_codes.h"
+#include "extensions/common/error_utils.h"
namespace extensions {
@@ -569,7 +569,7 @@ void GetProcessIdForTabFunction::GetProcessIdForTab() {
int tab_index = -1;
if (!ExtensionTabUtil::GetTabById(tab_id_, profile(), include_incognito(),
NULL, NULL, &contents, &tab_index)) {
- error_ = ExtensionErrorUtils::FormatErrorMessage(
+ error_ = ErrorUtils::FormatErrorMessage(
extensions::tabs_constants::kTabNotFoundError,
base::IntToString(tab_id_));
SetResult(Value::CreateIntegerValue(-1));
@@ -647,7 +647,7 @@ void TerminateFunction::TerminateProcess() {
}
if (!found) {
- error_ = ExtensionErrorUtils::FormatErrorMessage(errors::kProcessNotFound,
+ error_ = ErrorUtils::FormatErrorMessage(errors::kProcessNotFound,
base::IntToString(process_id_));
SendResponse(false);
} else {
« no previous file with comments | « chrome/browser/extensions/api/preference/preference_api.cc ('k') | chrome/browser/extensions/api/proxy/proxy_api_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698