Update of the extension install UI:

chrome/common/extensions/extension.h

 // Copyright (c) 2009 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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/page_action.h"
 #include "googleurl/src/gurl.h"
 
 // Represents a Chrome extension.
 class Extension {
  public:
+  typedef std::vector<URLPattern> HostPermissions;
+
   // What an extension was loaded from.
   enum Location {
     INVALID,
     INTERNAL,           // A crx file from the internal Extensions directory.
     EXTERNAL_PREF,      // A crx file from an external directory (via prefs).
     EXTERNAL_REGISTRY,  // A crx file from an external directory (via eg the
                         // registry on Windows).
     LOAD                // --load-extension.
   };
 
@@ skipping 22 matching lines @@
     EXTENSION_ICON_BITTY = 16,
   };
 
   // Icon sizes used by the extension system.
   static const int kIconSizes[];
 
   // Each permission is a module that the extension is permitted to use.
   static const char* kPermissionNames[];
   static const size_t kNumPermissions;
 
-  // A classification of how dangerous an extension can be, based on what it has
-  // access to.
-  enum PermissionClass {
-    PERMISSION_CLASS_LOW = 0,  // green
-    PERMISSION_CLASS_MEDIUM,  // yellow
-    PERMISSION_CLASS_HIGH,  // orange
-    PERMISSION_CLASS_FULL,  // red
-  };
-
   struct PrivacyBlacklistInfo {
     FilePath path;  // Path to the plain-text blacklist.
   };
 
   // An NPAPI plugin included in the extension.
   struct PluginInfo {
     FilePath path;  // Path to the plugin.
     bool is_public;  // False if only this extension can load this plugin.
   };
 
@@ skipping 81 matching lines @@
   // Note: The result is coverted to lower-case because the browser enforces
   // hosts to be lower-case in omni-bar.
   static bool GenerateIdFromPublicKey(const std::string& input,
                                       std::string* output);
 
   // Expects base64 encoded |input| and formats into |output| including
   // the appropriate header & footer.
   static bool FormatPEMForFileOutput(const std::string input,
       std::string* output, bool is_public);
 
+  // Determine whether we should allow a silent upgrade from |old_extension| to
+  // |new_extension|. If not, the user will have to approve the upgrade.
+  static bool AllowSilentUpgrade(Extension* old_extension,
+                                 Extension* new_extension);
+
   // Initialize the extension from a parsed manifest.
   // If |require_id| is true, will return an error if the "id" key is missing
   // from the value.
   bool InitFromValue(const DictionaryValue& value, bool require_id,
                      std::string* error);
 
   const FilePath& path() const { return path_; }
   void set_path(const FilePath& path) { path_ = path; }
   const GURL& url() const { return extension_url_; }
   const Location location() const { return location_; }
   void set_location(Location location) { location_ = location; }
   const std::string& id() const { return id_; }
   const Version* version() const { return version_.get(); }
   // String representation of the version number.
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   const PageActionMap& page_actions() const { return page_actions_; }
   const std::vector<PrivacyBlacklistInfo>& privacy_blacklists() const {
     return privacy_blacklists_;
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const GURL& background_url() const { return background_url_; }
   const std::vector<ToolstripInfo>& toolstrips() const { return toolstrips_; }
-  const std::vector<URLPattern>& host_permissions() const {
+  const HostPermissions& host_permissions() const {
     return host_permissions_;
   }
   const std::vector<std::string>& api_permissions() const {
     return api_permissions_;
   }
+
+  // Returns the set of hosts that the extension effectively has access to. This
+  // is used in the permissions UI and is a combination of the hosts accessible
+  // through content scripts and the hosts accessible through XHR.
+  const std::set<std::string> GetEffectiveHostPermissions() const;
+
+  // Whether the extension has access to all hosts. This is true if there is
+  // a content script that matches all hosts, or if there is a host permission
+  // for all hosts.
+  bool HasAccessToAllHosts() const;
+
   const GURL& update_url() const { return update_url_; }
   const std::map<int, std::string>& icons() { return icons_; }
 
   // Retrieves a page action by |id|.
   const PageAction* GetPageAction(std::string id) const;
 
   // Returns the origin of this extension. This function takes a |registry_path|
   // so that the registry location can be overwritten during testing.
   Location ExternalExtensionInstallType(std::string registry_path);
 
   // Theme-related.
   DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
   DictionaryValue* GetThemeColors() const { return theme_colors_.get(); }
   DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
   DictionaryValue* GetThemeDisplayProperties() const {
     return theme_display_properties_.get();
   }
   bool IsTheme() { return is_theme_; }
 
   // Returns a list of paths (relative to the extension dir) for images that
   // the browser might load (like themes and page action icons).
   std::set<FilePath> GetBrowserImages();
 
-  // Calculates and returns the permission class this extension is in.
-  PermissionClass GetPermissionClass();
-
   // Returns an absolute path to the given icon inside of the extension. Returns
   // an empty FilePath if the extension does not have that icon.
   FilePath GetIconPath(Icons icon);
 
   const DictionaryValue* manifest_value() const {
     return manifest_value_.get();
   }
 
   // Returns a list of all locales supported by the extension.
   const std::set<std::string>& supported_locales() const {
@@ skipping 106 matching lines @@
   // A map of display properties.
   scoped_ptr<DictionaryValue> theme_display_properties_;
 
   // Whether the extension is a theme - if it is, certain things are disabled.
   bool is_theme_;
 
   // The set of module-level APIs this extension can use.
   std::vector<std::string> api_permissions_;
 
   // The sites this extension has permission to talk to (using XHR, etc).
-  std::vector<URLPattern> host_permissions_;
+  HostPermissions host_permissions_;
 
   // The paths to the icons the extension contains mapped by their width.
   std::map<int, std::string> icons_;
 
   // URL for fetching an update manifest
   GURL update_url_;
 
   // A copy of the manifest that this extension was created from.
   scoped_ptr<DictionaryValue> manifest_value_;
 
     // List of all locales extension supports.
   std::set<std::string> supported_locales_;
 
   // Default locale, used for fallback.
   std::string default_locale_;
 
   // Runtime data:
 
   // True if the background page is ready.
   bool background_page_ready_;
 
   FRIEND_TEST(ExtensionTest, LoadPageActionHelper);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_