summaryrefslogtreecommitdiffstats
path: root/chrome/common/render_messages.h
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 07:50:11 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 07:50:11 +0000
commit75709691d97122dbefd7d73ce0cfade557e498b5 (patch)
treef79b37918e4c345a21036a11d5d7c6520e118ab6 /chrome/common/render_messages.h
parent5ed550d5336a5c159adf5dd319a62d13d01c0eed (diff)
downloadchromium_src-75709691d97122dbefd7d73ce0cfade557e498b5.zip
chromium_src-75709691d97122dbefd7d73ce0cfade557e498b5.tar.gz
chromium_src-75709691d97122dbefd7d73ce0cfade557e498b5.tar.bz2
Allow multiple domains in app.
Subsequent changes will: * Allow URLPatterns to specify * for scheme, so that http/https doesn't need to be repeated for each host. * Fix the overlap detection. Suggested review order: - test files - url_pattern* - extension_extent* - extension* - everything else BUG=46633 Review URL: http://codereview.chromium.org/2876007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages.h')
-rw-r--r--chrome/common/render_messages.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 2b757e9..061a236 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -2683,25 +2683,21 @@ template <>
struct ParamTraits<ExtensionExtent> {
typedef ExtensionExtent param_type;
static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.origin());
- WriteParam(m, p.paths());
+ WriteParam(m, p.patterns());
}
static bool Read(const Message* m, void** iter, param_type* p) {
- GURL origin;
- std::vector<std::string> paths;
+ std::vector<URLPattern> patterns;
bool success =
- ReadParam(m, iter, &origin) &&
- ReadParam(m, iter, &paths);
+ ReadParam(m, iter, &patterns);
if (!success)
return false;
- p->set_origin(origin);
- for (size_t i = 0; i < paths.size(); ++i)
- p->add_path(paths[i]);
+ for (size_t i = 0; i < patterns.size(); ++i)
+ p->AddPattern(patterns[i]);
return true;
}
static void Log(const param_type& p, std::wstring* l) {
- LogParam(p.origin(), l);
+ LogParam(p.patterns(), l);
}
};