Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Side by Side Diff: url/url_canon_relative.cc

Issue 14222028: url: Replace Google copyright with the Chromium licence in all files that uses it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « url/url_canon_query.cc ('k') | url/url_canon_stdstring.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2007, Google Inc. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // All rights reserved. 2 // Use of this source code is governed by a BSD-style license that can be
3 // 3 // found in the LICENSE file.
4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are
6 // met:
7 //
8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above
11 // copyright notice, this list of conditions and the following disclaimer
12 // in the documentation and/or other materials provided with the
13 // distribution.
14 // * Neither the name of Google Inc. nor the names of its
15 // contributors may be used to endorse or promote products derived from
16 // this software without specific prior written permission.
17 //
18 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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.
29 4
30 // Canonicalizer functions for working with and resolving relative URLs. 5 // Canonicalizer functions for working with and resolving relative URLs.
31 6
32 #include "base/logging.h" 7 #include "base/logging.h"
33 #include "url/url_canon.h" 8 #include "url/url_canon.h"
34 #include "url/url_canon_internal.h" 9 #include "url/url_canon_internal.h"
35 #include "url/url_file.h" 10 #include "url/url_file.h"
36 #include "url/url_parse_internal.h" 11 #include "url/url_parse_internal.h"
37 #include "url/url_util_internal.h" 12 #include "url/url_util_internal.h"
38 13
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 const url_parse::Component& relative_component, 545 const url_parse::Component& relative_component,
571 CharsetConverter* query_converter, 546 CharsetConverter* query_converter,
572 CanonOutput* output, 547 CanonOutput* output,
573 url_parse::Parsed* out_parsed) { 548 url_parse::Parsed* out_parsed) {
574 return DoResolveRelativeURL<char16>( 549 return DoResolveRelativeURL<char16>(
575 base_url, base_parsed, base_is_file, relative_url, 550 base_url, base_parsed, base_is_file, relative_url,
576 relative_component, query_converter, output, out_parsed); 551 relative_component, query_converter, output, out_parsed);
577 } 552 }
578 553
579 } // namespace url_canon 554 } // namespace url_canon
OLDNEW
« no previous file with comments | « url/url_canon_query.cc ('k') | url/url_canon_stdstring.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698