summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/user_script_master.h
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-23 20:48:59 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-23 20:48:59 +0000
commiteab9b45f79f18963793e0f4d666a83b311caabd3 (patch)
tree8ba9b44119deb7652f55838e494664cf395ae94c /chrome/browser/extensions/user_script_master.h
parent3418ebed0b079864abd37cf3d6d622ef4aa3b42c (diff)
downloadchromium_src-eab9b45f79f18963793e0f4d666a83b311caabd3.zip
chromium_src-eab9b45f79f18963793e0f4d666a83b311caabd3.tar.gz
chromium_src-eab9b45f79f18963793e0f4d666a83b311caabd3.tar.bz2
Try again to commit r8486, which updates the manifest
parsing in the Extension class to also parse out user script details. The problem was that extension_protocols.cc appears to link OK if you don't refer to anything in it, but as soon as you try to use something defined in it, a bunch of other symbols it refers to turn up undefined. To avoid this problem in the future, I stopped compiling extensions_protocol.cc so that we would realize if we tried to use it. Also in this change, I absolutified paths in ExtensionsService before creating Extension instances. On Linux, the path that PathService was giving us was not absolute. Review URL: http://codereview.chromium.org/18704 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/user_script_master.h')
-rw-r--r--chrome/browser/extensions/user_script_master.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 8df49be..5167a65 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -12,6 +12,14 @@
#include "base/scoped_ptr.h"
#include "base/shared_memory.h"
#include "base/string_piece.h"
+#include "googleurl/src/gurl.h"
+
+struct UserScriptInfo {
+ GURL url;
+ FilePath path;
+ std::vector<std::string> matches;
+};
+typedef std::vector<UserScriptInfo> UserScriptList;
// Manages a segment of shared memory that contains the user scripts the user
// has installed. Lives on the UI thread.