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

Side by Side Diff: components/url_fixer/url_fixer.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 | « components/search_engines/template_url.h ('k') | components/url_fixer/url_fixer_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 (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 #include "components/url_fixer/url_fixer.h" 5 #include "components/url_fixer/url_fixer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #if defined(OS_POSIX) 12 #if defined(OS_POSIX)
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #endif 14 #endif
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "net/base/escape.h" 17 #include "net/base/escape.h"
18 #include "net/base/filename_util.h" 18 #include "net/base/filename_util.h"
19 #include "net/base/net_util.h" 19 #include "net/base/net_util.h"
20 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 20 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
21 #include "url/third_party/mozilla/url_parse.h"
21 #include "url/url_file.h" 22 #include "url/url_file.h"
22 #include "url/url_parse.h"
23 #include "url/url_util.h" 23 #include "url/url_util.h"
24 24
25 const char* url_fixer::home_directory_override = NULL; 25 const char* url_fixer::home_directory_override = NULL;
26 26
27 namespace { 27 namespace {
28 28
29 // Hardcode these constants to avoid dependences on //chrome and //content. 29 // Hardcode these constants to avoid dependences on //chrome and //content.
30 const char kChromeUIScheme[] = "chrome"; 30 const char kChromeUIScheme[] = "chrome";
31 const char kChromeUIDefaultHost[] = "version"; 31 const char kChromeUIDefaultHost[] = "version";
32 const char kViewSourceScheme[] = "view-source"; 32 const char kViewSourceScheme[] = "view-source";
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 part->reset(); 669 part->reset();
670 } 670 }
671 } 671 }
672 672
673 bool url_fixer::IsEquivalentScheme(const std::string& scheme1, 673 bool url_fixer::IsEquivalentScheme(const std::string& scheme1,
674 const std::string& scheme2) { 674 const std::string& scheme2) {
675 return scheme1 == scheme2 || 675 return scheme1 == scheme2 ||
676 (scheme1 == url::kAboutScheme && scheme2 == kChromeUIScheme) || 676 (scheme1 == url::kAboutScheme && scheme2 == kChromeUIScheme) ||
677 (scheme1 == kChromeUIScheme && scheme2 == url::kAboutScheme); 677 (scheme1 == kChromeUIScheme && scheme2 == url::kAboutScheme);
678 } 678 }
OLDNEW
« no previous file with comments | « components/search_engines/template_url.h ('k') | components/url_fixer/url_fixer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698