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 12 matching lines...) Expand all Loading... |
23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 | 29 |
30 // Functions to canonicalize "standard" URLs, which are ones that have an | 30 // Functions to canonicalize "standard" URLs, which are ones that have an |
31 // authority section including a host name. | 31 // authority section including a host name. |
32 | 32 |
33 #include "googleurl/src/url_canon.h" | 33 #include "url/url_canon.h" |
34 #include "googleurl/src/url_canon_internal.h" | 34 #include "url/url_canon_internal.h" |
35 | 35 |
36 namespace url_canon { | 36 namespace url_canon { |
37 | 37 |
38 namespace { | 38 namespace { |
39 | 39 |
40 template<typename CHAR, typename UCHAR> | 40 template<typename CHAR, typename UCHAR> |
41 bool DoCanonicalizeStandardURL(const URLComponentSource<CHAR>& source, | 41 bool DoCanonicalizeStandardURL(const URLComponentSource<CHAR>& source, |
42 const url_parse::Parsed& parsed, | 42 const url_parse::Parsed& parsed, |
43 CharsetConverter* query_converter, | 43 CharsetConverter* query_converter, |
44 CanonOutput* output, | 44 CanonOutput* output, |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 url_parse::Parsed* new_parsed) { | 202 url_parse::Parsed* new_parsed) { |
203 RawCanonOutput<1024> utf8; | 203 RawCanonOutput<1024> utf8; |
204 URLComponentSource<char> source(base); | 204 URLComponentSource<char> source(base); |
205 url_parse::Parsed parsed(base_parsed); | 205 url_parse::Parsed parsed(base_parsed); |
206 SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); | 206 SetupUTF16OverrideComponents(base, replacements, &utf8, &source, &parsed); |
207 return DoCanonicalizeStandardURL<char, unsigned char>( | 207 return DoCanonicalizeStandardURL<char, unsigned char>( |
208 source, parsed, query_converter, output, new_parsed); | 208 source, parsed, query_converter, output, new_parsed); |
209 } | 209 } |
210 | 210 |
211 } // namespace url_canon | 211 } // namespace url_canon |
OLD | NEW |