← Back to branch summary

~zaspire/oxide/push-messaging

« back to all changes in this revision

Viewing changes to shared/common/oxide_user_script.cc

  • Committer: Chris Coulson
  • Date: 2015-06-06 07:54:28 UTC
  • mfrom: (640.1.295 canary)
  • Revision ID: chris.coulson@canonical.com-20150606075428-j66022f5fhyjntf1
Bump Chromium rev to 45.0.2421.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/common/oxide_user_script.cc
36
36
}
37
37
 
38
38
// static
39
 
void UserScript::PickleGlobs(::Pickle* pickle,
 
39
void UserScript::PickleGlobs(base::Pickle* pickle,
40
40
                             const std::vector<std::string>& globs) {
41
41
  pickle->WriteUInt64(globs.size());
42
42
  for (std::vector<std::string>::const_iterator it = globs.begin();
46
46
}
47
47
 
48
48
// static
49
 
void UserScript::UnpickleGlobs(PickleIterator* iter,
 
49
void UserScript::UnpickleGlobs(base::PickleIterator* iter,
50
50
                               std::vector<std::string>* globs) {
51
51
  globs->clear();
52
52
 
60
60
}
61
61
 
62
62
// static
63
 
void UserScript::PickleURLPatternSet(::Pickle* pickle,
 
63
void UserScript::PickleURLPatternSet(base::Pickle* pickle,
64
64
                                     const extensions::URLPatternSet& set) {
65
65
  pickle->WriteUInt64(set.size());
66
66
  for (extensions::URLPatternSet::const_iterator it = set.begin();
71
71
}
72
72
 
73
73
// static
74
 
void UserScript::UnpickleURLPatternSet(PickleIterator* iter,
 
74
void UserScript::UnpickleURLPatternSet(base::PickleIterator* iter,
75
75
                                       extensions::URLPatternSet* set) {
76
76
  set->ClearPatterns();
77
77
 
113
113
  exclude_pattern_set_.AddPattern(pattern);
114
114
}
115
115
 
116
 
void UserScript::Pickle(::Pickle* pickle) const {
 
116
void UserScript::Pickle(base::Pickle* pickle) const {
117
117
  pickle->WriteInt(run_location());
118
118
  pickle->WriteBool(match_all_frames());
119
119
  pickle->WriteBool(incognito_enabled());
129
129
  pickle->WriteData(content().data(), content().length());
130
130
}
131
131
 
132
 
void UserScript::Unpickle(PickleIterator* iter) {
 
132
void UserScript::Unpickle(base::PickleIterator* iter) {
133
133
  CHECK(iter->ReadInt(reinterpret_cast<int*>(&run_location_)));
134
134
  CHECK(iter->ReadBool(&match_all_frames_));
135
135
  CHECK(iter->ReadBool(&incognito_enabled_));