| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/common/user_script.h" | 5 #include "extensions/common/user_script.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/atomic_sequence_num.h" | 10 #include "base/atomic_sequence_num.h" |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 pattern_list->ClearPatterns(); | 294 pattern_list->ClearPatterns(); |
| 295 for (uint32_t i = 0; i < num_patterns; ++i) { | 295 for (uint32_t i = 0; i < num_patterns; ++i) { |
| 296 int valid_schemes; | 296 int valid_schemes; |
| 297 CHECK(iter->ReadInt(&valid_schemes)); | 297 CHECK(iter->ReadInt(&valid_schemes)); |
| 298 | 298 |
| 299 std::string pattern_str; | 299 std::string pattern_str; |
| 300 CHECK(iter->ReadString(&pattern_str)); | 300 CHECK(iter->ReadString(&pattern_str)); |
| 301 | 301 |
| 302 URLPattern pattern(kValidUserScriptSchemes); | 302 URLPattern pattern(kValidUserScriptSchemes); |
| 303 URLPattern::ParseResult result = pattern.Parse(pattern_str); | 303 URLPattern::ParseResult result = pattern.Parse(pattern_str); |
| 304 CHECK(URLPattern::PARSE_SUCCESS == result) << | 304 CHECK(URLPattern::PARSE_SUCCESS == result); |
| 305 URLPattern::GetParseResultString(result) << " " << pattern_str.c_str(); | |
| 306 | 305 |
| 307 pattern.SetValidSchemes(valid_schemes); | 306 pattern.SetValidSchemes(valid_schemes); |
| 308 pattern_list->AddPattern(pattern); | 307 pattern_list->AddPattern(pattern); |
| 309 } | 308 } |
| 310 } | 309 } |
| 311 | 310 |
| 312 void UserScript::UnpickleScripts(const base::Pickle& pickle, | 311 void UserScript::UnpickleScripts(const base::Pickle& pickle, |
| 313 base::PickleIterator* iter, | 312 base::PickleIterator* iter, |
| 314 FileList* scripts) { | 313 FileList* scripts) { |
| 315 uint32_t num_files = 0; | 314 uint32_t num_files = 0; |
| 316 CHECK(iter->ReadUInt32(&num_files)); | 315 CHECK(iter->ReadUInt32(&num_files)); |
| 317 scripts->clear(); | 316 scripts->clear(); |
| 318 for (uint32_t i = 0; i < num_files; ++i) { | 317 for (uint32_t i = 0; i < num_files; ++i) { |
| 319 std::unique_ptr<File> file(new File()); | 318 std::unique_ptr<File> file(new File()); |
| 320 file->Unpickle(pickle, iter); | 319 file->Unpickle(pickle, iter); |
| 321 scripts->push_back(std::move(file)); | 320 scripts->push_back(std::move(file)); |
| 322 } | 321 } |
| 323 } | 322 } |
| 324 | 323 |
| 325 UserScriptIDPair::UserScriptIDPair(int id, const HostID& host_id) | 324 UserScriptIDPair::UserScriptIDPair(int id, const HostID& host_id) |
| 326 : id(id), host_id(host_id) {} | 325 : id(id), host_id(host_id) {} |
| 327 | 326 |
| 328 UserScriptIDPair::UserScriptIDPair(int id) : id(id), host_id(HostID()) {} | 327 UserScriptIDPair::UserScriptIDPair(int id) : id(id), host_id(HostID()) {} |
| 329 | 328 |
| 330 bool operator<(const UserScriptIDPair& a, const UserScriptIDPair& b) { | 329 bool operator<(const UserScriptIDPair& a, const UserScriptIDPair& b) { |
| 331 return a.id < b.id; | 330 return a.id < b.id; |
| 332 } | 331 } |
| 333 | 332 |
| 334 } // namespace extensions | 333 } // namespace extensions |
| OLD | NEW |