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

Unified Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 1049483003: [Extensions] Update extensions UI to observe events and add test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/developer_private/extension_info_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/developer_private/developer_private_api.cc
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index b48788b6c92486dc5a41335a9e4417f3e0a50cbb..d89f9f0cf65fb8fabf9c9263855aa85d7fcdfab6 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -144,6 +144,8 @@ void BroadcastItemStateChanged(content::BrowserContext* browser_context,
developer::EventData event_data;
event_data.event_type = event_type;
event_data.item_id = item_id;
+ event_data.extension_info =
+ ExtensionInfoGenerator(browser_context).CreateExtensionInfo(item_id);
scoped_ptr<base::ListValue> args(new base::ListValue());
args->Append(event_data.ToValue().release());
@@ -378,26 +380,13 @@ DeveloperPrivateGetExtensionInfoFunction::Run() {
developer::GetExtensionInfo::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);
- ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
- developer::ExtensionState state = developer::EXTENSION_STATE_ENABLED;
- const Extension* extension =
- registry->enabled_extensions().GetByID(params->id);
- if (!extension &&
- (extension = registry->disabled_extensions().GetByID(params->id)) !=
- nullptr) {
- state = developer::EXTENSION_STATE_DISABLED;
- } else if (!extension &&
- (extension =
- registry->terminated_extensions().GetByID(params->id)) !=
- nullptr) {
- state = developer::EXTENSION_STATE_TERMINATED;
- }
+ scoped_ptr<developer::ExtensionInfo> info =
+ ExtensionInfoGenerator(browser_context()).CreateExtensionInfo(params->id);
- if (!extension)
+ if (!info)
return RespondNow(Error(kNoSuchExtensionError));
- return RespondNow(OneArgument(ExtensionInfoGenerator(browser_context()).
- CreateExtensionInfo(*extension, state)->ToValue().release()));
+ return RespondNow(OneArgument(info->ToValue().release()));
}
DeveloperPrivateGetItemsInfoFunction::DeveloperPrivateGetItemsInfoFunction() {}
« no previous file with comments | « no previous file | chrome/browser/extensions/api/developer_private/extension_info_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698