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

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

Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 ae2c9c0392ed758424145c562f06496b2180b676..250c17e50aafff9f52deb710825a14a2fce3b3dd 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -606,7 +606,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
return converted_from_user_script_;
}
const UserScriptList& content_scripts() const { return content_scripts_; }
- const ActionInfo* page_action_info() const { return page_action_info_.get(); }
const ActionInfo* browser_action_info() const {
return browser_action_info_.get();
}
@@ -833,7 +832,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
string16* error);
bool LoadManifestHandlerFeatures(string16* error);
bool LoadContentScripts(string16* error);
- bool LoadPageAction(string16* error);
bool LoadBrowserAction(string16* error);
bool LoadSystemIndicator(APIPermissionSet* api_permissions, string16* error);
bool LoadTextToSpeechVoices(string16* error);
@@ -981,9 +979,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
// Paths to the content scripts the extension contains.
UserScriptList content_scripts_;
- // The extension's page action, if any.
- scoped_ptr<ActionInfo> page_action_info_;
-
// The extension's browser action, if any.
scoped_ptr<ActionInfo> browser_action_info_;
@@ -1105,7 +1100,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
// vulnerabilities.
std::string content_security_policy_;
- FRIEND_TEST_ALL_PREFIXES(ExtensionTest, LoadPageActionHelper);
FRIEND_TEST_ALL_PREFIXES(::TabStripModelTest, Apps);
DISALLOW_COPY_AND_ASSIGN(Extension);

Powered by Google App Engine
This is Rietveld 408576698