| 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 // Canonicalizer functions for working with and resolving relative URLs. | 5 // Canonicalizer functions for working with and resolving relative URLs. |
| 6 | 6 |
| 7 #include <ostream> |
| 8 |
| 7 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/string16.h" |
| 11 #include "url/third_party/mozilla/url_parse.h" |
| 8 #include "url/url_canon.h" | 12 #include "url/url_canon.h" |
| 9 #include "url/url_canon_internal.h" | 13 #include "url/url_canon_internal.h" |
| 10 #include "url/url_constants.h" | 14 #include "url/url_constants.h" |
| 11 #include "url/url_file.h" | |
| 12 #include "url/url_parse_internal.h" | 15 #include "url/url_parse_internal.h" |
| 13 #include "url/url_util_internal.h" | 16 #include "url/url_util_internal.h" |
| 14 | 17 |
| 15 namespace url { | 18 namespace url { |
| 16 | 19 |
| 17 namespace { | 20 namespace { |
| 18 | 21 |
| 19 // Firefox does a case-sensitive compare (which is probably wrong--Mozilla bug | 22 // Firefox does a case-sensitive compare (which is probably wrong--Mozilla bug |
| 20 // 379034), whereas IE is case-insensitive. | 23 // 379034), whereas IE is case-insensitive. |
| 21 // | 24 // |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 const Component& relative_component, | 558 const Component& relative_component, |
| 556 CharsetConverter* query_converter, | 559 CharsetConverter* query_converter, |
| 557 CanonOutput* output, | 560 CanonOutput* output, |
| 558 Parsed* out_parsed) { | 561 Parsed* out_parsed) { |
| 559 return DoResolveRelativeURL<base::char16>( | 562 return DoResolveRelativeURL<base::char16>( |
| 560 base_url, base_parsed, base_is_file, relative_url, | 563 base_url, base_parsed, base_is_file, relative_url, |
| 561 relative_component, query_converter, output, out_parsed); | 564 relative_component, query_converter, output, out_parsed); |
| 562 } | 565 } |
| 563 | 566 |
| 564 } // namespace url | 567 } // namespace url |
| OLD | NEW |