Hook up extension apps notification permission, take two

chrome/browser/net/chrome_url_request_context.h

 // Copyright (c) 2010 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_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 #define CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 
 #include "base/file_path.h"
 #include "base/linked_ptr.h"
 #include "net/base/cookie_monster.h"
@@ skipping 26 matching lines @@
 // All methods of this class must be called from the IO thread,
 // including the constructor and destructor.
 class ChromeURLRequestContext : public URLRequestContext {
  public:
   // Maintains some extension-related state we need on the IO thread.
   // TODO(aa): It would be cool if the Extension objects in ExtensionsService
   // could be immutable and ref-counted so that we could use them directly from
   // both threads. There is only a small amount of mutable state in Extension.
   struct ExtensionInfo {
     ExtensionInfo(const FilePath& path, const std::string& default_locale,
-                  const Extension::URLPatternList& extent,
+                  const ExtensionExtent& extent,
                   const std::vector<std::string>& api_permissions)
         : path(path), default_locale(default_locale),
           extent(extent), api_permissions(api_permissions) {
     }
     FilePath path;
     std::string default_locale;
-    Extension::URLPatternList extent;
+    ExtensionExtent extent;
     std::vector<std::string> api_permissions;
   };
 
   // Map of extension info by extension id.
   typedef std::map<std::string, linked_ptr<ExtensionInfo> > ExtensionInfoMap;
 
   ChromeURLRequestContext();
 
   // Gets the path to the directory for the specified extension.
   FilePath GetPathForExtension(const std::string& id);
 
   // Returns an empty string if the extension with |id| doesn't have a default
   // locale.
   std::string GetDefaultLocaleForExtension(const std::string& id);
 
   // Determine whether a URL has access to the specified extension permission.
-  // TODO(aa): This will eventually have to take an additional parameter: the
-  // ID of a specific extension to check, since |url| could show up in multiple
-  // extensions.
   bool CheckURLAccessToExtensionPermission(const GURL& url,
-                                           const std::string& application_id,
                                            const char* permission_name);
 
   // Gets the path to the directory user scripts are stored in.
   FilePath user_script_dir_path() const {
     return user_script_dir_path_;
   }
 
   // Gets the appcache service to be used for requests in this context.
   // May be NULL if requests for this context aren't subject to appcaching.
   ChromeAppCacheService* appcache_service() const {
@@ skipping 307 matching lines @@
   IOThread* const io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextFactory);
 };
 
 // Creates a proxy configuration using the overrides specified on the command
 // line. Returns NULL if the system defaults should be used instead.
 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line);
 
 #endif  // CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_