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

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, 9 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/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 946ec7af46d5458e8bdfe2234b64aa3173bfe940..ba583149b086259e00adea0349e978dfe72a3d29 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -151,6 +151,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());
@@ -407,26 +409,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);
Dan Beam 2015/04/06 23:53:11 +\s\s
Devlin 2015/04/07 16:07:54 Done.
- if (!extension)
+ if (!info)
Dan Beam 2015/04/06 23:53:12 how is info ever empty? https://code.google.com/p/
Devlin 2015/04/07 16:07:54 Two methods. One takes a const Extension& (resulta
Dan Beam 2015/04/07 17:21:13 yeah, sorry, found the answer but didn't delete co
return RespondNow(Error(kNoSuchExtensionError));
- return RespondNow(OneArgument(ExtensionInfoGenerator(browser_context()).
- CreateExtensionInfo(*extension, state)->ToValue().release()));
+ return RespondNow(OneArgument(info->ToValue().release()));
}
DeveloperPrivateGetItemsInfoFunction::DeveloperPrivateGetItemsInfoFunction() {}

Powered by Google App Engine
This is Rietveld 408576698