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

Side by Side Diff: url/gurl.cc

Issue 14016005: url: Changes to make it build standalone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add blank line 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/gurl.h ('k') | url/gurl_unittest.cc » ('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 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
11 // copyright notice, this list of conditions and the following disclaimer 11 // copyright notice, this list of conditions and the following disclaimer
12 // in the documentation and/or other materials provided with the 12 // in the documentation and/or other materials provided with the
13 // distribution. 13 // distribution.
14 // * Neither the name of Google Inc. nor the names of its 14 // * Neither the name of Google Inc. nor the names of its
15 // contributors may be used to endorse or promote products derived from 15 // contributors may be used to endorse or promote products derived from
16 // this software without specific prior written permission. 16 // this software without specific prior written permission.
17 // 17 //
18 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
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 29
30 #include "url/gurl.h"
31
30 #ifdef WIN32 32 #ifdef WIN32
31 #include <windows.h> 33 #include <windows.h>
32 #else 34 #else
33 #include <pthread.h> 35 #include <pthread.h>
34 #endif 36 #endif
35 37
36 #include <algorithm> 38 #include <algorithm>
37 #include <ostream> 39 #include <ostream>
38 40
39 #include "googleurl/src/gurl.h"
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
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 }
OLDNEW
« no previous file with comments | « url/gurl.h ('k') | url/gurl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698