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

Unified Diff: chrome/browser/autocomplete/builtin_provider.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/builtin_provider.cc
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index e9e08cf6ca8b7728d974a8d2f323d932dd0e91c1..e8b021786ff30576dc8bfe3753ae3426d8fbe669 100644
--- a/chrome/browser/autocomplete/builtin_provider.cc
+++ b/chrome/browser/autocomplete/builtin_provider.cc
@@ -70,8 +70,9 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
(input.type() == metrics::OmniboxInputType::QUERY))
return;
- const size_t kAboutSchemeLength = strlen(content::kAboutScheme);
- const base::string16 kAbout = base::ASCIIToUTF16(content::kAboutScheme) +
+ const size_t kAboutSchemeLength = strlen(url::kAboutScheme);
+ const base::string16 kAbout =
+ base::ASCIIToUTF16(url::kAboutScheme) +
base::ASCIIToUTF16(url::kStandardSchemeSeparator);
const base::string16 kChrome = base::ASCIIToUTF16(content::kChromeUIScheme) +
base::ASCIIToUTF16(url::kStandardSchemeSeparator);
@@ -110,12 +111,12 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
// Chrome does not support trailing slashes or paths for about:blank.
const base::string16 blank_host = base::ASCIIToUTF16("blank");
const base::string16 host = base::UTF8ToUTF16(url.host());
- if (StartsWith(text, base::ASCIIToUTF16(content::kAboutScheme), false) &&
+ if (StartsWith(text, base::ASCIIToUTF16(url::kAboutScheme), false) &&
StartsWith(blank_host, host, false) && (url.path().length() <= 1) &&
!EndsWith(text, base::ASCIIToUTF16("/"), false)) {
ACMatchClassifications styles;
styles.push_back(ACMatchClassification(0, kMatch));
- base::string16 match = base::ASCIIToUTF16(content::kAboutBlankURL);
+ base::string16 match = base::ASCIIToUTF16(url::kAboutBlankURL);
// Measure the length of the matching host after the "about:" scheme.
const size_t corrected_length = kAboutSchemeLength + 1 + host.length();
if (blank_host.length() > host.length())
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_browsertest.cc ('k') | chrome/browser/autocomplete/builtin_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698