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

Side by Side 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: Resolve a merge conflict. Created 6 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
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 "chrome/browser/autocomplete/autocomplete_provider.h" 5 #include "chrome/browser/autocomplete/autocomplete_provider.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/autocomplete/autocomplete_match.h" 10 #include "chrome/browser/autocomplete/autocomplete_match.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 input->UpdateText(output, base::string16::npos, parts); 203 input->UpdateText(output, base::string16::npos, parts);
204 return !output.empty(); 204 return !output.empty();
205 } 205 }
206 206
207 // static 207 // static
208 size_t AutocompleteProvider::TrimHttpPrefix(base::string16* url) { 208 size_t AutocompleteProvider::TrimHttpPrefix(base::string16* url) {
209 // Find any "http:". 209 // Find any "http:".
210 if (!AutocompleteInput::HasHTTPScheme(*url)) 210 if (!AutocompleteInput::HasHTTPScheme(*url))
211 return 0; 211 return 0;
212 size_t scheme_pos = 212 size_t scheme_pos =
213 url->find(base::ASCIIToUTF16(content::kHttpScheme) + base::char16(':')); 213 url->find(base::ASCIIToUTF16(url::kHttpScheme) + base::char16(':'));
214 DCHECK_NE(base::string16::npos, scheme_pos); 214 DCHECK_NE(base::string16::npos, scheme_pos);
215 215
216 // Erase scheme plus up to two slashes. 216 // Erase scheme plus up to two slashes.
217 size_t prefix_end = scheme_pos + strlen(content::kHttpScheme) + 1; 217 size_t prefix_end = scheme_pos + strlen(url::kHttpScheme) + 1;
218 const size_t after_slashes = std::min(url->length(), prefix_end + 2); 218 const size_t after_slashes = std::min(url->length(), prefix_end + 2);
219 while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/')) 219 while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))
220 ++prefix_end; 220 ++prefix_end;
221 url->erase(scheme_pos, prefix_end - scheme_pos); 221 url->erase(scheme_pos, prefix_end - scheme_pos);
222 return (scheme_pos == 0) ? prefix_end : 0; 222 return (scheme_pos == 0) ? prefix_end : 0;
223 } 223 }
224 224
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_match.cc ('k') | chrome/browser/autocomplete/base_search_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698