| Index: chrome/common/extensions/extension.h
|
| diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
|
| index 6f824e60c8b36e6dc476b89668c785f95f35aa4a..f31dfc5f1dac7dc074a26a4d656343f475bbee62 100644
|
| --- a/chrome/common/extensions/extension.h
|
| +++ b/chrome/common/extensions/extension.h
|
| @@ -550,10 +550,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // Returns true if the extension has a content script declared at |url|.
|
| bool HasContentScriptAtURL(const GURL& url) const;
|
|
|
| - // Returns an ExtensionAction representing the script badge that should be
|
| - // shown for this extension in the location bar.
|
| - ExtensionAction* GetScriptBadge() const;
|
| -
|
| // Gets the tab-specific host permissions of |tab_id|, or NULL if there
|
| // aren't any.
|
| //
|
| @@ -588,6 +584,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| return converted_from_user_script_;
|
| }
|
| const UserScriptList& content_scripts() const { return content_scripts_; }
|
| + ExtensionAction* script_badge() const { return script_badge_.get(); }
|
| ExtensionAction* page_action() const { return page_action_.get(); }
|
| ExtensionAction* browser_action() const { return browser_action_.get(); }
|
| ExtensionAction::Type declared_action_type() const {
|
| @@ -822,6 +819,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| bool LoadContentScripts(string16* error);
|
| bool LoadPageAction(string16* error);
|
| bool LoadBrowserAction(string16* error);
|
| + bool LoadScriptBadge(string16* error);
|
| bool LoadFileBrowserHandlers(string16* error);
|
| // Helper method to load a FileBrowserHandlerList from the manifest.
|
| FileBrowserHandlerList* LoadFileBrowserHandlersHelper(
|
| @@ -870,7 +868,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // Helper method to load an ExtensionAction from the page_action or
|
| // browser_action entries in the manifest.
|
| scoped_ptr<ExtensionAction> LoadExtensionActionHelper(
|
| - const base::DictionaryValue* extension_action, string16* error);
|
| + const base::DictionaryValue* extension_action,
|
| + ExtensionAction::Type action_type,
|
| + string16* error);
|
|
|
| // Helper method that loads the OAuth2 info from the 'oauth2' manifest key.
|
| bool LoadOAuth2Info(string16* error);
|
|
|