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

Unified Diff: chrome/browser/extensions/api/management/management_api.cc

Issue 10825310: Add a 'type' property to ExtensionInfo (chrome.management). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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/management/management_api.cc
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc
index 07c3455d542ce56fda1635274e06d7b5cca375d4..8bf15898e42800baad5c236928a9e9953e6e125a 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -49,6 +49,8 @@ using base::IntToString;
using content::BrowserThread;
using content::UtilityProcessHost;
using content::UtilityProcessHostClient;
+using extensions::api::management::ExtensionInfo;
+using extensions::api::management::IconInfo;
using extensions::Extension;
using extensions::ExtensionSystem;
using extensions::PermissionMessages;
@@ -99,6 +101,18 @@ scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(
info->may_disable = system->management_policy()->
UserMayModifySettings(&extension, NULL);
info->is_app = extension.is_app();
+ if (info->is_app) {
+ if (extension.is_packaged_app())
+ info->type = ExtensionInfo::TYPE_PACKAGED_APP;
+ else if (extension.is_hosted_app())
+ info->type = ExtensionInfo::TYPE_HOSTED_APP;
+ else
+ info->type = ExtensionInfo::TYPE_PLATFORM_APP;
+ } else if (extension.is_theme()) {
+ info->type = ExtensionInfo::TYPE_THEME;
+ } else {
+ info->type = ExtensionInfo::TYPE_EXTENSION;
+ }
if (info->enabled) {
info->disabled_reason = management::ExtensionInfo::DISABLED_REASON_NONE;
« no previous file with comments | « no previous file | chrome/common/extensions/api/management.json » ('j') | chrome/common/extensions/api/management.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698