Implemented proper support for checking schemes and requested resource types.

chrome/browser/extensions/api/declarative/url_matcher.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_BROWSER_EXTENSIONS_API_DECLARATIVE_URL_MATCHER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_URL_MATCHER_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 161 matching lines @@
   };
   // Set to ensure that we generate only one SubstringPattern for each content
   // of SubstringPattern::pattern().
   typedef std::set<SubstringPattern*, SubstringPatternPointerCompare>
       PatternSingletons;
   PatternSingletons pattern_singletons_;
 
   DISALLOW_COPY_AND_ASSIGN(URLMatcherConditionFactory);
 };
 
+// This class represents a filter for the URL scheme to be hooked up into a
+// URLMatcherConditionSet.
+class URLMatcherSchemeFilter {
+ public:
+  explicit URLMatcherSchemeFilter(const std::string& filter);
+  explicit URLMatcherSchemeFilter(const std::vector<std::string>& filters);
+  ~URLMatcherSchemeFilter();
+  bool IsMatch(const GURL& url) const;
+
+ private:
+  std::vector<std::string> filters_;
+
+  DISALLOW_COPY_AND_ASSIGN(URLMatcherSchemeFilter);
+};
+
 // This class represents a set of conditions that all need to match on a
 // given URL in order to be considered a match.
 class URLMatcherConditionSet : public base::RefCounted<URLMatcherConditionSet> {
  public:
   typedef int ID;
   typedef std::set<URLMatcherCondition> Conditions;
   typedef std::vector<scoped_refptr<URLMatcherConditionSet> > Vector;
 
+  // Matches if all conditions in |conditions| are fulfilled.
   URLMatcherConditionSet(ID id, const Conditions& conditions);
 
+  // Matches if all conditions in |conditions| and |scheme_filter| are
+  // fulfilled. |scheme_filter| may be NULL, in which case, no restrictions
+  // are imposed on the scheme of a URL.
+  URLMatcherConditionSet(ID id, const Conditions& conditions,
+                         scoped_ptr<URLMatcherSchemeFilter> scheme_filter);
+
   ID id() const { return id_; }
   const Conditions& conditions() const { return conditions_; }
 
   bool IsMatch(
       const std::set<SubstringPattern::ID>& matching_substring_patterns,
       const GURL& url) const;
 
  private:
   friend class base::RefCounted<URLMatcherConditionSet>;
   ~URLMatcherConditionSet();
   ID id_;
   Conditions conditions_;
+  scoped_ptr<URLMatcherSchemeFilter> scheme_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(URLMatcherConditionSet);
 };
 
 // This class allows matching one URL against a large set of
 // URLMatcherConditionSets at the same time.
 class URLMatcher {
  public:
   URLMatcher();
   ~URLMatcher();
@@ skipping 50 matching lines @@
   SubstringSetMatcher url_component_matcher_;
   std::set<const SubstringPattern*> registered_full_url_patterns_;
   std::set<const SubstringPattern*> registered_url_component_patterns_;
 
   DISALLOW_COPY_AND_ASSIGN(URLMatcher);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_URL_MATCHER_H_