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

Unified Diff: chrome/common/extensions/extension.h

Issue 12618009: Move SystemIndicator parsing out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 37f30e9bf4223824eb9ade6456bd13aa352441cd..4daea8f6a21613dbd7166aa4e5888b8fb757694d 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_;
« no previous file with comments | « chrome/common/extensions/api/system_indicator/system_indicator_handler.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698