| OLD | NEW |
| 1 // Copyright 2007, Google Inc. | 1 // Copyright 2007, Google Inc. |
| 2 // All rights reserved. | 2 // All rights reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
| 6 // met: | 6 // met: |
| 7 // | 7 // |
| 8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
| 9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
| 10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 #ifdef WIN32 | 30 #ifdef WIN32 |
| 31 #include <windows.h> | 31 #include <windows.h> |
| 32 #else | 32 #else |
| 33 #include <pthread.h> | 33 #include <pthread.h> |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 #include <algorithm> | 36 #include <algorithm> |
| 37 #include <ostream> | 37 #include <ostream> |
| 38 | 38 |
| 39 #include "googleurl/src/gurl.h" | 39 #include "url/gurl.h" |
| 40 | 40 |
| 41 #include "base/logging.h" | 41 #include "base/logging.h" |
| 42 #include "googleurl/src/url_canon_stdstring.h" | 42 #include "url/url_canon_stdstring.h" |
| 43 #include "googleurl/src/url_util.h" | 43 #include "url/url_util.h" |
| 44 | 44 |
| 45 namespace { | 45 namespace { |
| 46 | 46 |
| 47 // External template that can handle initialization of either character type. | 47 // External template that can handle initialization of either character type. |
| 48 // The input spec is given, and the canonical version will be placed in | 48 // The input spec is given, and the canonical version will be placed in |
| 49 // |*canonical|, along with the parsing of the canonical spec in |*parsed|. | 49 // |*canonical|, along with the parsing of the canonical spec in |*parsed|. |
| 50 template<typename STR> | 50 template<typename STR> |
| 51 bool InitCanonical(const STR& input_spec, | 51 bool InitCanonical(const STR& input_spec, |
| 52 std::string* canonical, | 52 std::string* canonical, |
| 53 url_parse::Parsed* parsed) { | 53 url_parse::Parsed* parsed) { |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 void GURL::Swap(GURL* other) { | 520 void GURL::Swap(GURL* other) { |
| 521 spec_.swap(other->spec_); | 521 spec_.swap(other->spec_); |
| 522 std::swap(is_valid_, other->is_valid_); | 522 std::swap(is_valid_, other->is_valid_); |
| 523 std::swap(parsed_, other->parsed_); | 523 std::swap(parsed_, other->parsed_); |
| 524 std::swap(inner_url_, other->inner_url_); | 524 std::swap(inner_url_, other->inner_url_); |
| 525 } | 525 } |
| 526 | 526 |
| 527 std::ostream& operator<<(std::ostream& out, const GURL& url) { | 527 std::ostream& operator<<(std::ostream& out, const GURL& url) { |
| 528 return out << url.possibly_invalid_spec(); | 528 return out << url.possibly_invalid_spec(); |
| 529 } | 529 } |
| OLD | NEW |