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

Side by Side Diff: components/omnibox/browser/bookmark_provider.cc

Issue 1651203002: Update components for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/omnibox/browser/DEPS ('k') | components/omnibox/browser/history_quick_provider.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/omnibox/browser/bookmark_provider.h" 5 #include "components/omnibox/browser/bookmark_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "components/bookmarks/browser/bookmark_match.h" 14 #include "components/bookmarks/browser/bookmark_match.h"
16 #include "components/bookmarks/browser/bookmark_model.h" 15 #include "components/bookmarks/browser/bookmark_model.h"
17 #include "components/metrics/proto/omnibox_input_type.pb.h" 16 #include "components/metrics/proto/omnibox_input_type.pb.h"
18 #include "components/omnibox/browser/autocomplete_provider_client.h" 17 #include "components/omnibox/browser/autocomplete_provider_client.h"
19 #include "components/omnibox/browser/autocomplete_result.h" 18 #include "components/omnibox/browser/autocomplete_result.h"
20 #include "components/omnibox/browser/history_provider.h" 19 #include "components/omnibox/browser/history_provider.h"
21 #include "components/omnibox/browser/url_prefix.h" 20 #include "components/omnibox/browser/url_prefix.h"
21 #include "components/prefs/pref_service.h"
22 #include "components/url_formatter/url_formatter.h" 22 #include "components/url_formatter/url_formatter.h"
23 #include "url/url_constants.h" 23 #include "url/url_constants.h"
24 24
25 using bookmarks::BookmarkMatch; 25 using bookmarks::BookmarkMatch;
26 using bookmarks::BookmarkNode; 26 using bookmarks::BookmarkNode;
27 27
28 typedef std::vector<BookmarkMatch> BookmarkMatches; 28 typedef std::vector<BookmarkMatch> BookmarkMatches;
29 29
30 namespace { 30 namespace {
31 31
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 i != positions.end(); 337 i != positions.end();
338 ++i) { 338 ++i) {
339 AutocompleteMatch::ACMatchClassifications new_class; 339 AutocompleteMatch::ACMatchClassifications new_class;
340 AutocompleteMatch::ClassifyLocationInString(i->first, i->second - i->first, 340 AutocompleteMatch::ClassifyLocationInString(i->first, i->second - i->first,
341 text_length, url_style, &new_class); 341 text_length, url_style, &new_class);
342 classifications = AutocompleteMatch::MergeClassifications( 342 classifications = AutocompleteMatch::MergeClassifications(
343 classifications, new_class); 343 classifications, new_class);
344 } 344 }
345 return classifications; 345 return classifications;
346 } 346 }
OLDNEW
« no previous file with comments | « components/omnibox/browser/DEPS ('k') | components/omnibox/browser/history_quick_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698