diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 07:05:43 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 07:05:43 +0000 |
| commit | 2c17977c344d3a6b3501370a8e30c83f0b93af03 (patch) | |
| tree | 789d57a1e231ac1c088e07421e3d90512de9ed83 /chrome/common/extensions/user_script.h | |
| parent | 0bf4dc62111e3329375eb5a87c4276c2f012ee27 (diff) | |
| download | chromium_src-2c17977c344d3a6b3501370a8e30c83f0b93af03.zip chromium_src-2c17977c344d3a6b3501370a8e30c83f0b93af03.tar.gz chromium_src-2c17977c344d3a6b3501370a8e30c83f0b93af03.tar.bz2 | |
Fix exclude_matches functionality
This should allow the manifest to use the exclude_matches field in content scripts successfully.
BUG=107505
TEST=See bug. A simple extension to test the exclude matches functionality, compliments of mihaip@chromium.org, is attached.
Review URL: http://codereview.chromium.org/8963010
Patch from Devlin Cronin <RDevlin.Cronin@gmail.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114960 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/user_script.h')
| -rw-r--r-- | chrome/common/extensions/user_script.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h index 71c31ac..53147fc 100644 --- a/chrome/common/extensions/user_script.h +++ b/chrome/common/extensions/user_script.h @@ -190,6 +190,21 @@ class UserScript { void Unpickle(const ::Pickle& pickle, void** iter); private: + // Pickle helper functions used to pickle the individual types of components. + void PickleGlobs(::Pickle* pickle, + const std::vector<std::string>& globs) const; + void PickleURLPatternSet(::Pickle* pickle, + const URLPatternSet& pattern_list) const; + void PickleScripts(::Pickle* pickle, const FileList& scripts) const; + + // Unpickle helper functions used to unpickle individual types of components. + void UnpickleGlobs(const ::Pickle& pickle, void** iter, + std::vector<std::string>* globs); + void UnpickleURLPatternSet(const ::Pickle& pickle, void** iter, + URLPatternSet* pattern_list); + void UnpickleScripts(const ::Pickle& pickle, void** iter, + FileList* scripts); + // The location to run the script inside the document. RunLocation run_location_; |