| 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 483bddde53ceac5d07917c138317500576208a8e..d60c6b5d096ba0014317d0f8ad3c3443b3e54425 100644
|
| --- a/chrome/browser/ui/app_list/search/omnibox_provider.cc
|
| +++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc
|
| @@ -9,13 +9,14 @@
|
| #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
|
| #include "chrome/browser/bookmarks/bookmark_model_factory.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/app_list/search/search_util.h"
|
| #include "chrome/browser/ui/browser_navigator.h"
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| #include "components/metrics/proto/omnibox_event.pb.h"
|
| #include "components/omnibox/autocomplete_input.h"
|
| #include "components/omnibox/autocomplete_match.h"
|
| #include "grit/theme_resources.h"
|
| +#include "ui/app_list/search_result.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| namespace app_list {
|
| @@ -65,7 +66,7 @@ void ACMatchClassificationsToTags(
|
| }
|
| }
|
|
|
| -class OmniboxResult : public ChromeSearchResult {
|
| +class OmniboxResult : public SearchResult {
|
| public:
|
| OmniboxResult(Profile* profile,
|
| AutocompleteController* autocomplete_controller,
|
| @@ -90,8 +91,9 @@ class OmniboxResult : public ChromeSearchResult {
|
| }
|
| virtual ~OmniboxResult() {}
|
|
|
| - // ChromeSearchResult overides:
|
| + // SearchResult overrides:
|
| virtual void Open(int event_flags) OVERRIDE {
|
| + RecordHistogram(OMNIBOX_SEARCH_RESULT);
|
| chrome::NavigateParams params(profile_,
|
| match_.destination_url,
|
| match_.transition);
|
| @@ -99,17 +101,11 @@ class OmniboxResult : public ChromeSearchResult {
|
| chrome::Navigate(¶ms);
|
| }
|
|
|
| - virtual void InvokeAction(int action_index, int event_flags) OVERRIDE {}
|
| -
|
| - virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE {
|
| - return scoped_ptr<ChromeSearchResult>(
|
| + virtual scoped_ptr<SearchResult> Duplicate() OVERRIDE {
|
| + return scoped_ptr<SearchResult>(
|
| new OmniboxResult(profile_, autocomplete_controller_, match_)).Pass();
|
| }
|
|
|
| - virtual ChromeSearchResultType GetType() OVERRIDE {
|
| - return OMNIBOX_SEARCH_RESULT;
|
| - }
|
| -
|
| private:
|
| void UpdateIcon() {
|
| BookmarkModel* bookmark_model =
|
|
|