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

Unified Diff: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

Issue 415053002: Remove AutocompleteMatch::is_starred (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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/ui/webui/omnibox/omnibox_ui_handler.cc
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
index f74297f4a21021439ced590b8661d398112d500f..78bfc5bb8f20b0e6f60fdaaa9c279f4ebf8d8988 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
@@ -18,10 +18,12 @@
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/autocomplete/autocomplete_provider.h"
#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "components/bookmarks/browser/bookmark_model.h"
#include "components/history/core/browser/url_database.h"
#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/search_engines/template_url.h"
@@ -82,7 +84,6 @@ class TypeConverter<AutocompleteMatchMojoPtr, AutocompleteMatch> {
mojo::String::From(input.associated_keyword->keyword);
}
result->keyword = mojo::String::From(input.keyword);
- result->starred = input.starred;
result->duplicates = static_cast<int32>(input.duplicate_matches.size());
result->from_previous = input.from_previous;
@@ -141,6 +142,24 @@ void OmniboxUIHandler::OnResultChanged(bool default_match_changed) {
result->results_by_provider =
mojo::Array<AutocompleteResultsForProviderMojoPtr>::From(
controller_->providers());
+
+ // Fill AutocompleteMatchMojo::starred.
+ BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_);
+ if (bookmark_model) {
+ for (size_t i = 0; i < result->combined_results.size(); ++i) {
+ result->combined_results[i]->starred = bookmark_model->IsBookmarked(
+ GURL(result->combined_results[i]->destination_url));
+ }
+ for (size_t i = 0; i < result->results_by_provider.size(); ++i) {
+ const AutocompleteResultsForProviderMojo& result_by_provider =
+ *result->results_by_provider[i];
+ for (size_t j = 0; j < result_by_provider.results.size(); ++j) {
+ result_by_provider.results[j]->starred = bookmark_model->IsBookmarked(
+ GURL(result_by_provider.results[j]->destination_url));
+ }
+ }
+ }
+
client()->HandleNewAutocompleteResult(result.Pass());
}
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | components/metrics/proto/omnibox_event.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698