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

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

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update url/BUILD.gn and address some style nits. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_provider.cc
diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc
index acd9878a47bc27fb0486f0640feb748f6aa727fc..4ea935b502688049a753c440127aa9c4562e8c06 100644
--- a/chrome/browser/autocomplete/autocomplete_provider.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider.cc
@@ -17,6 +17,7 @@
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
#include "url/gurl.h"
+#include "url/url_constants.h"
// static
const size_t AutocompleteProvider::kMaxMatches = 3;
@@ -210,11 +211,11 @@ size_t AutocompleteProvider::TrimHttpPrefix(base::string16* url) {
if (!AutocompleteInput::HasHTTPScheme(*url))
return 0;
size_t scheme_pos =
- url->find(base::ASCIIToUTF16(content::kHttpScheme) + base::char16(':'));
+ url->find(base::ASCIIToUTF16(url::kHttpScheme) + base::char16(':'));
DCHECK_NE(base::string16::npos, scheme_pos);
// Erase scheme plus up to two slashes.
- size_t prefix_end = scheme_pos + strlen(content::kHttpScheme) + 1;
+ size_t prefix_end = scheme_pos + strlen(url::kHttpScheme) + 1;
const size_t after_slashes = std::min(url->length(), prefix_end + 2);
while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))
++prefix_end;

Powered by Google App Engine
This is Rietveld 408576698