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

Side by Side Diff: chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks
Patch Set: Replace in .mm files Created 4 years, 4 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/ui/webui/omnibox/omnibox_page_handler.h" 5 #include "chrome/browser/ui/webui/omnibox/omnibox_page_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/auto_reset.h" 12 #include "base/auto_reset.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" 20 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
21 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 21 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
22 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 22 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
23 #include "chrome/browser/history/history_service_factory.h" 23 #include "chrome/browser/history/history_service_factory.h"
24 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/search/search.h" 25 #include "chrome/browser/search/search.h"
25 #include "chrome/browser/search_engines/template_url_service_factory.h" 26 #include "chrome/browser/search_engines/template_url_service_factory.h"
26 #include "components/bookmarks/browser/bookmark_model.h" 27 #include "components/bookmarks/browser/bookmark_model.h"
27 #include "components/history/core/browser/history_service.h" 28 #include "components/history/core/browser/history_service.h"
28 #include "components/history/core/browser/url_database.h" 29 #include "components/history/core/browser/url_database.h"
29 #include "components/metrics/proto/omnibox_event.pb.h" 30 #include "components/metrics/proto/omnibox_event.pb.h"
30 #include "components/omnibox/browser/autocomplete_classifier.h" 31 #include "components/omnibox/browser/autocomplete_classifier.h"
31 #include "components/omnibox/browser/autocomplete_controller.h" 32 #include "components/omnibox/browser/autocomplete_controller.h"
32 #include "components/omnibox/browser/autocomplete_match.h" 33 #include "components/omnibox/browser/autocomplete_match.h"
33 #include "components/omnibox/browser/autocomplete_provider.h" 34 #include "components/omnibox/browser/autocomplete_provider.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 ACMatches matches(controller_->result().begin(), 143 ACMatches matches(controller_->result().begin(),
143 controller_->result().end()); 144 controller_->result().end());
144 result->combined_results = 145 result->combined_results =
145 mojo::Array<mojom::AutocompleteMatchPtr>::From(matches); 146 mojo::Array<mojom::AutocompleteMatchPtr>::From(matches);
146 } 147 }
147 result->results_by_provider = 148 result->results_by_provider =
148 mojo::Array<mojom::AutocompleteResultsForProviderPtr>::From( 149 mojo::Array<mojom::AutocompleteResultsForProviderPtr>::From(
149 controller_->providers()); 150 controller_->providers());
150 151
151 // Fill AutocompleteMatch::starred. 152 // Fill AutocompleteMatch::starred.
152 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); 153 BookmarkModel* bookmark_model =
154 BookmarkModelFactory::GetForBrowserContext(profile_);
153 if (bookmark_model) { 155 if (bookmark_model) {
154 for (size_t i = 0; i < result->combined_results.size(); ++i) { 156 for (size_t i = 0; i < result->combined_results.size(); ++i) {
155 result->combined_results[i]->starred = bookmark_model->IsBookmarked( 157 result->combined_results[i]->starred = bookmark_model->IsBookmarked(
156 GURL(result->combined_results[i]->destination_url.get())); 158 GURL(result->combined_results[i]->destination_url.get()));
157 } 159 }
158 for (size_t i = 0; i < result->results_by_provider.size(); ++i) { 160 for (size_t i = 0; i < result->results_by_provider.size(); ++i) {
159 const mojom::AutocompleteResultsForProvider& result_by_provider = 161 const mojom::AutocompleteResultsForProvider& result_by_provider =
160 *result->results_by_provider[i]; 162 *result->results_by_provider[i];
161 for (size_t j = 0; j < result_by_provider.results.size(); ++j) { 163 for (size_t j = 0; j < result_by_provider.results.size(); ++j) {
162 result_by_provider.results[j]->starred = bookmark_model->IsBookmarked( 164 result_by_provider.results[j]->starred = bookmark_model->IsBookmarked(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 prevent_inline_autocomplete, prefer_keyword, true, true, false, 207 prevent_inline_autocomplete, prefer_keyword, true, true, false,
206 ChromeAutocompleteSchemeClassifier(profile_)); 208 ChromeAutocompleteSchemeClassifier(profile_));
207 controller_->Start(input_); 209 controller_->Start(input_);
208 } 210 }
209 211
210 void OmniboxPageHandler::ResetController() { 212 void OmniboxPageHandler::ResetController() {
211 controller_.reset(new AutocompleteController( 213 controller_.reset(new AutocompleteController(
212 base::WrapUnique(new ChromeAutocompleteProviderClient(profile_)), this, 214 base::WrapUnique(new ChromeAutocompleteProviderClient(profile_)), this,
213 AutocompleteClassifier::kDefaultOmniboxProviders)); 215 AutocompleteClassifier::kDefaultOmniboxProviders));
214 } 216 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/browsing_history_handler.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698