← Back to branch summary

~abreu-alexandre/oxide/vibrate

« back to all changes in this revision

Viewing changes to shared/common/oxide_user_script.cc

  • Committer: Chris Coulson
  • Date: 2016-01-07 10:16:06 UTC
  • mfrom: (640.1.432 crmaster)
  • Revision ID: chris.coulson@canonical.com-20160107101606-r7lxmvdh4xrviwfo
Merge r1072 from lp:oxide/crmaster

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/common/oxide_user_script.cc
51
51
                               std::vector<std::string>* globs) {
52
52
  globs->clear();
53
53
 
54
 
  uint64 size = 0;
 
54
  uint64_t size = 0;
55
55
  CHECK(iter->ReadUInt64(&size));
56
56
  for (; size > 0; --size) {
57
57
    std::string glob;
76
76
                                       extensions::URLPatternSet* set) {
77
77
  set->ClearPatterns();
78
78
 
79
 
  uint64 size = 0;
 
79
  uint64_t size = 0;
80
80
  CHECK(iter->ReadUInt64(&size));
81
81
  for (; size > 0; --size) {
82
82
    int valid_schemes = 0;