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

Unified Diff: chrome/browser/automation/automation_provider_json.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 months 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/automation/automation_provider_json.cc
diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc
index 2350ed3c3e22550909b87d8eff00737d38c34b61..6b27e464890c05e11f849640d07b5168566db35f 100644
--- a/chrome/browser/automation/automation_provider_json.cc
+++ b/chrome/browser/automation/automation_provider_json.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/automation_id.h"
#include "chrome/common/automation_messages.h"
+#include "chrome/common/extensions/extension.h"
#include "content/public/browser/web_contents.h"
using automation::Error;
@@ -181,7 +182,7 @@ bool GetExtensionFromJSONArgsHelper(
const std::string& key,
Profile* profile,
bool include_disabled,
- const Extension** extension,
+ const extensions::Extension** extension,
std::string* error) {
std::string id;
if (!args->GetString(key, &id)) {
@@ -200,7 +201,7 @@ bool GetExtensionFromJSONArgsHelper(
id.c_str());
return false;
}
- const Extension* installed_extension =
+ const extensions::Extension* installed_extension =
service->GetExtensionById(id, include_disabled);
if (!installed_extension) {
*error = "Extension is disabled or has crashed.";
@@ -216,7 +217,7 @@ bool GetExtensionFromJSONArgs(
base::DictionaryValue* args,
const std::string& key,
Profile* profile,
- const Extension** extension,
+ const extensions::Extension** extension,
std::string* error) {
return GetExtensionFromJSONArgsHelper(
args, key, profile, true /* include_disabled */, extension, error);
@@ -226,7 +227,7 @@ bool GetEnabledExtensionFromJSONArgs(
base::DictionaryValue* args,
const std::string& key,
Profile* profile,
- const Extension** extension,
+ const extensions::Extension** extension,
std::string* error) {
return GetExtensionFromJSONArgsHelper(
args, key, profile, false /* include_disabled */, extension, error);
« no previous file with comments | « chrome/browser/automation/automation_provider_json.h ('k') | chrome/browser/automation/automation_provider_observers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698