Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

chrome/common/extensions/extension.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
 #include "chrome/common/extensions/permissions/permission_message.h"
 #include "chrome/common/extensions/user_script.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "googleurl/src/gurl.h"
@@ skipping 15 matching lines @@
 class ImageSkia;
 }
 
 namespace webkit_glue {
 struct WebIntentServiceData;
 }
 
 FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
 
 namespace extensions {
-

[Yoyo Zhou, 2012/12/18 02:01:41]

doesn't seem necessary to remove this

[Devlin, 2012/12/18 20:42:07]

Didn't realize I did that; whoops.

 class Manifest;
 class PermissionSet;
 
 typedef std::set<std::string> OAuth2Scopes;
 
 // Represents a Chrome extension.
 class Extension : public base::RefCountedThreadSafe<Extension> {
  public:
   struct InstallWarning;
   struct ManifestData;
@@ skipping 146 matching lines @@
   struct OAuth2Info {
     OAuth2Info();
     ~OAuth2Info();
 
     OAuth2Scopes GetScopesAsSet();
 
     std::string client_id;
     std::vector<std::string> scopes;
   };
 
-  struct ActionInfo {
-    explicit ActionInfo();
-    ~ActionInfo();
-
-    // The types of extension actions.
-    enum Type {
-      TYPE_BROWSER,
-      TYPE_PAGE,
-      TYPE_SCRIPT_BADGE,
-      TYPE_SYSTEM_INDICATOR,
-    };
-
-    // Empty implies the key wasn't present.
-    ExtensionIconSet default_icon;
-    std::string default_title;
-    GURL default_popup_url;
-    // action id -- only used with legacy page actions API.
-    std::string id;
-  };
-
   struct FileHandlerInfo {
     explicit FileHandlerInfo();
     ~FileHandlerInfo();
     std::string id;
     std::string title;
 
     // File extensions associated with this handler.
     std::set<std::string> extensions;
 
     // MIME types associated with this handler.
@@ skipping 427 matching lines @@
   // Base64-encoded version of the key used to sign this extension.
   // In pseudocode, returns
   // base::Base64Encode(RSAPrivateKey(pem_file).ExportPublicKey()).
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   int manifest_version() const { return manifest_version_; }
   bool converted_from_user_script() const {
     return converted_from_user_script_;
   }
   const UserScriptList& content_scripts() const { return content_scripts_; }
-  const ActionInfo* script_badge_info() const {
-    return script_badge_info_.get();
-  }
   const ActionInfo* page_action_info() const { return page_action_info_.get(); }
   const ActionInfo* browser_action_info() const {
     return browser_action_info_.get();
   }
   const ActionInfo* system_indicator_info() const {
     return system_indicator_info_.get();
   }
   const FileBrowserHandlerList* file_browser_handlers() const {
     return file_browser_handlers_.get();
   }
@@ skipping 45 matching lines @@
   }
   const GURL& options_url() const { return options_url_; }
   const GURL& devtools_url() const { return devtools_url_; }
   const GURL& details_url() const { return details_url_;}
   const PermissionSet* optional_permission_set() const {
     return optional_permission_set_.get();
   }
   const PermissionSet* required_permission_set() const {
     return required_permission_set_.get();
   }
-  // Appends |new_warnings| to install_warnings().
+  // Appends |new_warning[s]| to install_warnings_.
+  void AddInstallWarning(const InstallWarning& new_warning);
   void AddInstallWarnings(const InstallWarningVector& new_warnings);
   const InstallWarningVector& install_warnings() const {
     return install_warnings_;
   }
   const GURL& update_url() const { return update_url_; }
   const ExtensionIconSet& icons() const { return icons_; }
   const extensions::Manifest* manifest() const {
     return manifest_.get();
   }
   const std::string default_locale() const { return default_locale_; }
@@ skipping 176 matching lines @@
   bool LoadFileHandlers(string16* error);
   bool LoadExtensionFeatures(APIPermissionSet* api_permissions,
                              string16* error);
   bool LoadManifestHandlerFeatures(string16* error);
   bool LoadDevToolsPage(string16* error);
   bool LoadInputComponents(const APIPermissionSet& api_permissions,
                            string16* error);
   bool LoadContentScripts(string16* error);
   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(
       const base::ListValue* extension_actions, string16* error);
   // Helper method to load an FileBrowserHandler from manifest.
   FileBrowserHandler* LoadFileBrowserHandler(
       const base::DictionaryValue* file_browser_handlers, string16* error);
   bool LoadChromeURLOverrides(string16* error);
   bool LoadTextToSpeechVoices(string16* error);
@@ skipping 25 matching lines @@
 
   // Helper method that loads either the include_globs or exclude_globs list
   // from an entry in the content_script lists of the manifest.
   bool LoadGlobsHelper(const base::DictionaryValue* content_script,
                        int content_script_index,
                        const char* globs_property_name,
                        string16* error,
                        void(UserScript::*add_method)(const std::string& glob),
                        UserScript* instance);
 
-  // Helper method to load an ExtensionAction from the page_action or
-  // browser_action entries in the manifest.
-  scoped_ptr<ActionInfo> LoadExtensionActionInfoHelper(
-      const base::DictionaryValue* manifest_section,
-      ActionInfo::Type action_type,

[Yoyo Zhou, 2012/12/18 02:01:41]

Cool, this was never used!

-      string16* error);
-
   // Helper method that loads the OAuth2 info from the 'oauth2' manifest key.
   bool LoadOAuth2Info(string16* error);
 
   // Returns true if the extension has more than one "UI surface". For example,
   // an extension that has a browser action and a page action.
   bool HasMultipleUISurfaces() const;
 
   // Updates the launch URL and extents for the extension using the given
   // |override_url|.
   void OverrideLaunchUrl(const GURL& override_url);
@@ skipping 87 matching lines @@
 
   // 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_;
 
-  // 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_;
 
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional list of NaCl modules and associated properties.
@@ skipping 198 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_