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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_provider.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit 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"
11 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" 11 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/common/net/url_fixer_upper.h" 14 #include "chrome/common/net/url_fixer_upper.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "components/bookmarks/core/browser/bookmark_model.h" 16 #include "components/bookmarks/browser/bookmark_model.h"
17 #include "content/public/common/url_constants.h" 17 #include "content/public/common/url_constants.h"
18 #include "net/base/net_util.h" 18 #include "net/base/net_util.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 // static 21 // static
22 const size_t AutocompleteProvider::kMaxMatches = 3; 22 const size_t AutocompleteProvider::kMaxMatches = 3;
23 23
24 AutocompleteProvider::AutocompleteProvider( 24 AutocompleteProvider::AutocompleteProvider(
25 AutocompleteProviderListener* listener, 25 AutocompleteProviderListener* listener,
26 Profile* profile, 26 Profile* profile,
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(url::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/android/signin/signin_manager_android.cc ('k') | chrome/browser/autocomplete/bookmark_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698