| Index: chrome/common/extensions/extension.h
|
| diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
|
| index 8efd7cf9f3911a8b3854ab057d2776682ad2ec10..149c111e24bf2ef0857b8e4217d5b1846cd16f94 100644
|
| --- a/chrome/common/extensions/extension.h
|
| +++ b/chrome/common/extensions/extension.h
|
| @@ -224,6 +224,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| TYPE_BROWSER,
|
| TYPE_PAGE,
|
| TYPE_SCRIPT_BADGE,
|
| + TYPE_SYSTEM_INDICATOR,
|
| };
|
|
|
| // Empty implies the key wasn't present.
|
| @@ -666,6 +667,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| const ActionInfo* browser_action_info() const {
|
| return browser_action_info_.get();
|
| }
|
| + const ActionInfo* system_indicator_info() const {
|
| + return system_indicator_info_.get();
|
| + }
|
| bool is_verbose_install_message() const {
|
| return !omnibox_keyword().empty() ||
|
| browser_action_info() ||
|
| @@ -910,7 +914,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| const base::DictionaryValue& handler_info,
|
| string16* error);
|
| bool LoadFileHandlers(string16* error);
|
| - bool LoadExtensionFeatures(const APIPermissionSet& api_permissions,
|
| + bool LoadExtensionFeatures(APIPermissionSet* api_permissions,
|
| string16* error);
|
| bool LoadDevToolsPage(string16* error);
|
| bool LoadInputComponents(const APIPermissionSet& api_permissions,
|
| @@ -919,6 +923,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| bool LoadPageAction(string16* error);
|
| bool LoadBrowserAction(string16* error);
|
| bool LoadScriptBadge(string16* error);
|
| + bool LoadSystemIndicator(APIPermissionSet* api_permissions, string16* error);
|
| bool LoadFileBrowserHandlers(string16* error);
|
| // Helper method to load a FileBrowserHandlerList from the manifest.
|
| FileBrowserHandlerList* LoadFileBrowserHandlersHelper(
|
| @@ -1081,6 +1086,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // The extension's script badge. Never NULL.
|
| scoped_ptr<ActionInfo> script_badge_info_;
|
|
|
| + // The extension's system indicator, if any.
|
| + scoped_ptr<ActionInfo> system_indicator_info_;
|
| +
|
| // The extension's file browser actions, if any.
|
| scoped_ptr<FileBrowserHandlerList> file_browser_handlers_;
|
|
|
|
|