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

Unified Diff: chrome/browser/automation/testing_automation_provider.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/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 073d9862ece76e501f38e955838a5697c4bbdaa7..8480c30c75864fe258882f2e174fa49b1ebb86c0 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -187,6 +187,8 @@ using content::Referrer;
using content::RenderViewHost;
using content::SSLStatus;
using content::WebContents;
+using extensions::Extension;
+using extensions::ExtensionList;
namespace {
@@ -3998,9 +4000,8 @@ ListValue* GetAPIPermissions(const Extension* ext) {
// Sample json input: { "command": "GetExtensionsInfo" }
// See GetExtensionsInfo() in chrome/test/pyautolib/pyauto.py for sample json
// output.
-void TestingAutomationProvider::GetExtensionsInfo(
- DictionaryValue* args,
- IPC::Message* reply_message) {
+void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
+ IPC::Message* reply_message) {
AutomationJSONReply reply(this, reply_message);
Browser* browser;
std::string error_msg;
@@ -4046,9 +4047,11 @@ void TestingAutomationProvider::GetExtensionsInfo(
Extension::Location location = extension->location();
extension_value->SetBoolean("is_component",
location == Extension::COMPONENT);
- extension_value->SetBoolean("is_internal", location == Extension::INTERNAL);
+ extension_value->SetBoolean("is_internal",
+ location == Extension::INTERNAL);
extension_value->SetBoolean("is_user_installed",
- location == Extension::INTERNAL || location == Extension::LOAD);
+ location == Extension::INTERNAL ||
+ location == Extension::LOAD);
extension_value->SetBoolean("is_enabled", service->IsExtensionEnabled(id));
extension_value->SetBoolean("allowed_in_incognito",
service->IsIncognitoEnabled(id));
@@ -4151,7 +4154,8 @@ void TestingAutomationProvider::SetExtensionStateById(
AutomationJSONReply(this, reply_message).SendSuccess(NULL);
}
} else {
- service->DisableExtension(extension->id(), Extension::DISABLE_USER_ACTION);
+ service->DisableExtension(extension->id(),
+ Extension::DISABLE_USER_ACTION);
AutomationJSONReply(this, reply_message).SendSuccess(NULL);
}
« no previous file with comments | « chrome/browser/automation/automation_util.cc ('k') | chrome/browser/background/background_application_list_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698