Make ActiveTabPermissionManager also grant the tabs permission.

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>
@@ skipping 420 matching lines @@
 
   // Parses the host and api permissions from the specified permission |key|
   // from |manifest_|.
   bool ParsePermissions(const char* key,
                         string16* error,
                         APIPermissionSet* api_permissions,
                         URLPatternSet* host_permissions);
 
   bool HasAPIPermission(APIPermission::ID permission) const;
   bool HasAPIPermission(const std::string& function_name) const;
+  bool HasAPIPermissionForTab(int tab_id, APIPermission::ID permission) const;
 
   const URLPatternSet& GetEffectiveHostPermissions() const;
 
   // Returns true if the extension can silently increase its permission level.
   // Users must approve permissions for unpacked and packed extensions in the
   // following situations:
   //  - when installing or upgrading packed extensions
   //  - when installing unpacked extensions that have NPAPI plugins
   //  - when either type of extension requests optional permissions
   bool CanSilentlyIncreasePermissions() const;
@@ skipping 101 matching lines @@
 
   // Returns true if the extension should be displayed in the extension
   // settings page (i.e. chrome://extensions).
   bool ShouldDisplayInExtensionSettings() const;
 
   // Returns true if the extension has a content script declared at |url|.
   bool HasContentScriptAtURL(const GURL& url) const;
 
   // Gets the tab-specific host permissions of |tab_id|, or NULL if there
   // aren't any.
-  //
-  // This is a weak pointer. Callers should create a copy before mutating any
-  // tab specific permissions.
-  const URLPatternSet* GetTabSpecificHostPermissions(int tab_id) const;
+  scoped_refptr<const PermissionSet> GetTabSpecificPermissions(int tab_id)
+      const;
 
-  // Sets the tab-specific host permissions of |tab_id| to |permissions|.
-  void SetTabSpecificHostPermissions(int tab_id,
-                                     const URLPatternSet& permissions) const;
+  // Updates the tab-specific permissions of |tab_id| to include those from
+  // |permissions|.
+  void UpdateTabSpecificPermissions(int tab_id,
+                                    const PermissionSet* permissions) const;
 
-  // Clears the tab-specific host permissions of |tab_id|.
-  void ClearTabSpecificHostPermissions(int tab_id) const;
+  // Clears the tab-specific permissions of |tab_id|.
+  void ClearTabSpecificPermissions(int tab_id) const;
 
   // Accessors:
 
   const FilePath& path() const { return path_; }
   const GURL& url() const { return extension_url_; }
   Location location() const;
   const std::string& id() const;
   const Version* version() const { return version_.get(); }
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
@@ skipping 130 matching lines @@
 
   class RuntimeData {
    public:
     RuntimeData();
     explicit RuntimeData(const PermissionSet* active);
     ~RuntimeData();
 
     void SetActivePermissions(const PermissionSet* active);
     scoped_refptr<const PermissionSet> GetActivePermissions() const;
 
-    const URLPatternSet* GetTabSpecificHostPermissions(int tab_id) const;
-    void SetTabSpecificHostPermissions(int tab_id,
-                                       const URLPatternSet& permissions);
-    void ClearTabSpecificHostPermissions(int tab_id);
+    scoped_refptr<const PermissionSet> GetTabSpecificPermissions(int tab_id)
+        const;
+    void UpdateTabSpecificPermissions(int tab_id,
+                                      const PermissionSet* permissions);
+    void ClearTabSpecificPermissions(int tab_id);
 
    private:
     friend class base::RefCountedThreadSafe<RuntimeData>;
 
     scoped_refptr<const PermissionSet> active_permissions_;
 
-    typedef std::map<int, linked_ptr<const URLPatternSet> >
-        TabHostPermissionsMap;
-    TabHostPermissionsMap tab_specific_host_permissions_;
+    typedef std::map<int, scoped_refptr<const PermissionSet> >
+        TabPermissionsMap;
+    TabPermissionsMap tab_specific_permissions_;
   };
 
   // Chooses the extension ID for an extension based on a variety of criteria.
   // The chosen ID will be set in |manifest|.
   static bool InitExtensionID(extensions::Manifest* manifest,
                               const FilePath& path,
                               const std::string& explicit_id,
                               int creation_flags,
                               string16* error);
 
@@ skipping 434 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 } // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_