Chromium Code Reviews| 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 11 matching lines...) Expand all Loading... | |
| 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 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 #ifndef GOOGLEURL_SRC_URL_CANON_H__ | 29 #ifndef GOOGLEURL_SRC_URL_CANON_H__ |
| 30 #define GOOGLEURL_SRC_URL_CANON_H__ | 30 #define GOOGLEURL_SRC_URL_CANON_H__ |
| 31 | 31 |
| 32 #include <memory.h> | 32 #include <string.h> |
|
Mark Seaborn
2012/05/11 21:28:41
Minor nit: dmichael pointed out that this leaves t
| |
| 33 #include <stdlib.h> | 33 #include <stdlib.h> |
| 34 | 34 |
| 35 #include "base/string16.h" | 35 #include "base/string16.h" |
| 36 #include "googleurl/src/url_common.h" | 36 #include "googleurl/src/url_common.h" |
| 37 #include "googleurl/src/url_parse.h" | 37 #include "googleurl/src/url_parse.h" |
| 38 | 38 |
| 39 namespace url_canon { | 39 namespace url_canon { |
| 40 | 40 |
| 41 // Canonicalizer output ------------------------------------------------------- | 41 // Canonicalizer output ------------------------------------------------------- |
| 42 | 42 |
| (...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 903 bool base_is_file, | 903 bool base_is_file, |
| 904 const char16* relative_url, | 904 const char16* relative_url, |
| 905 const url_parse::Component& relative_component, | 905 const url_parse::Component& relative_component, |
| 906 CharsetConverter* query_converter, | 906 CharsetConverter* query_converter, |
| 907 CanonOutput* output, | 907 CanonOutput* output, |
| 908 url_parse::Parsed* out_parsed); | 908 url_parse::Parsed* out_parsed); |
| 909 | 909 |
| 910 } // namespace url_canon | 910 } // namespace url_canon |
| 911 | 911 |
| 912 #endif // GOOGLEURL_SRC_URL_CANON_H__ | 912 #endif // GOOGLEURL_SRC_URL_CANON_H__ |
| OLD | NEW |