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

Side by Side Diff: net/base/registry_controlled_domains/registry_controlled_domain.cc

Issue 1152373003: url: Fix the TODO in url_parse.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/url_util.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // NB: Modelled after Mozilla's code (originally written by Pamela Greene, 5 // NB: Modelled after Mozilla's code (originally written by Pamela Greene,
6 // later modified by others), but almost entirely rewritten for Chrome. 6 // later modified by others), but almost entirely rewritten for Chrome.
7 // (netwerk/dns/src/nsEffectiveTLDService.cpp) 7 // (netwerk/dns/src/nsEffectiveTLDService.cpp)
8 /* ***** BEGIN LICENSE BLOCK ***** 8 /* ***** BEGIN LICENSE BLOCK *****
9 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 9 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
10 * 10 *
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 * ***** END LICENSE BLOCK ***** */ 44 * ***** END LICENSE BLOCK ***** */
45 45
46 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 46 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
47 47
48 #include "base/logging.h" 48 #include "base/logging.h"
49 #include "base/strings/string_util.h" 49 #include "base/strings/string_util.h"
50 #include "base/strings/utf_string_conversions.h" 50 #include "base/strings/utf_string_conversions.h"
51 #include "net/base/net_module.h" 51 #include "net/base/net_module.h"
52 #include "net/base/net_util.h" 52 #include "net/base/net_util.h"
53 #include "url/gurl.h" 53 #include "url/gurl.h"
54 #include "url/url_parse.h" 54 #include "url/third_party/mozilla/url_parse.h"
55 55
56 namespace net { 56 namespace net {
57 namespace registry_controlled_domains { 57 namespace registry_controlled_domains {
58 58
59 namespace { 59 namespace {
60 #include "net/base/registry_controlled_domains/effective_tld_names-inc.cc" 60 #include "net/base/registry_controlled_domains/effective_tld_names-inc.cc"
61 61
62 // See make_dafsa.py for documentation of the generated dafsa byte array. 62 // See make_dafsa.py for documentation of the generated dafsa byte array.
63 63
64 const unsigned char* g_graph = kDafsa; 64 const unsigned char* g_graph = kDafsa;
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 386
387 void SetFindDomainGraph(const unsigned char* domains, size_t length) { 387 void SetFindDomainGraph(const unsigned char* domains, size_t length) {
388 CHECK(domains); 388 CHECK(domains);
389 CHECK_NE(length, 0u); 389 CHECK_NE(length, 0u);
390 g_graph = domains; 390 g_graph = domains;
391 g_graph_length = length; 391 g_graph_length = length;
392 } 392 }
393 393
394 } // namespace registry_controlled_domains 394 } // namespace registry_controlled_domains
395 } // namespace net 395 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/url_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698