diff options
author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 19:21:04 +0000 |
---|---|---|
committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 19:21:04 +0000 |
commit | 4e786938a31f17f6f4d2df48a91856db04f4e28e (patch) | |
tree | 84662c2ce530bfd85dd6d5f59874985c78ec7117 /chrome/common/extensions/extension.h | |
parent | e4ee869804ccbe6cd6c4da5bf83f74f19488945d (diff) | |
download | chromium_src-4e786938a31f17f6f4d2df48a91856db04f4e28e.zip chromium_src-4e786938a31f17f6f4d2df48a91856db04f4e28e.tar.gz chromium_src-4e786938a31f17f6f4d2df48a91856db04f4e28e.tar.bz2 |
Move SystemIndicator parsing out of Extension class
TBR=ben@chromium.org, mirandac@chromium.org
(ben - gypis, mirandac - profiles)
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/12618009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension.h')
-rw-r--r-- | chrome/common/extensions/extension.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 37f30e9..4daea8f 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -21,7 +21,6 @@ #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest.h" #include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/permission_message.h" @@ -48,7 +47,6 @@ class ImageSkia; } namespace extensions { -struct ActionInfo; class APIPermissionSet; class PermissionSet; @@ -429,9 +427,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> { bool converted_from_user_script() const { return converted_from_user_script_; } - const ActionInfo* system_indicator_info() const { - return system_indicator_info_.get(); - } const std::vector<NaClModuleInfo>& nacl_modules() const { return nacl_modules_; } @@ -578,11 +573,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> { bool LoadRequirements(string16* error); bool LoadKioskEnabled(string16* error); bool LoadOfflineEnabled(string16* error); - bool LoadExtensionFeatures(string16* error); - bool LoadBrowserAction(string16* error); - bool LoadSystemIndicator(string16* error); bool LoadTextToSpeechVoices(string16* error); - bool LoadIncognitoMode(string16* error); bool LoadManagedModeFeatures(string16* error); bool LoadManagedModeSites( const base::DictionaryValue* content_pack_value, @@ -679,9 +670,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> { // different UI if so). bool converted_from_user_script_; - // The extension's system indicator, if any. - scoped_ptr<ActionInfo> system_indicator_info_; - // Optional list of NaCl modules and associated properties. std::vector<NaClModuleInfo> nacl_modules_; |