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

Unified Diff: chrome/browser/ui/app_list/search/omnibox_provider.cc

Issue 399063002: Remove BaseSearchProvider::set_in_app_list (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/autocomplete/base_search_provider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/search/omnibox_provider.cc
diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc
index eeda7683bb25fef6e52150f009fd49bf127b22b8..1e5188e7325685907c57e12322327f5861d22de7 100644
--- a/chrome/browser/ui/app_list/search/omnibox_provider.cc
+++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/autocomplete/autocomplete_controller.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
-#include "chrome/browser/autocomplete/search_provider.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
#include "chrome/browser/ui/browser_navigator.h"
@@ -69,6 +68,8 @@ class OmniboxResult : public ChromeSearchResult {
OmniboxResult(Profile* profile, const AutocompleteMatch& match)
: profile_(profile),
match_(match) {
+ if (match_.search_terms_args)
+ match_.search_terms_args->from_app_list = true;
Peter Kasting 2014/07/17 18:11:26 Does this actually work? I worry that we may not
hashimoto 2014/07/18 09:54:14 That's a valid concern. I should have been aware o
Peter Kasting 2014/07/18 17:37:06 I think it would be safer to actually call UpdateM
hashimoto 2014/07/22 10:33:07 I think UpdateMatchDestinationURL() cannot be used
Peter Kasting 2014/07/22 18:44:52 If there's a way to refactor the existing code so
hashimoto 2014/07/23 10:30:42 Added a new method to AutocompleteController.
set_id(match.destination_url.spec());
// Derive relevance from omnibox relevance and normalize it to [0, 1].
@@ -141,7 +142,6 @@ OmniboxProvider::OmniboxProvider(Profile* profile)
this,
AutocompleteClassifier::kDefaultOmniboxProviders &
~AutocompleteProvider::TYPE_ZERO_SUGGEST)) {
- controller_->search_provider()->set_in_app_list();
}
OmniboxProvider::~OmniboxProvider() {}
« no previous file with comments | « chrome/browser/autocomplete/base_search_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698