Simplifies the structure of app_list search a bit.

chrome/browser/ui/app_list/search/omnibox_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/search/omnibox_provider.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #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 {
 
 namespace {
 
 int ACMatchStyleToTagStyle(int styles) {
   int tag_styles = 0;
   if (styles & ACMatchClassification::URL)
     tag_styles |= SearchResult::Tag::URL;
@@ skipping 29 matching lines @@
     tag_start = text_class.offset;
     tag_styles = ACMatchStyleToTagStyle(text_class.style);
   }
 
   if (tag_styles != SearchResult::Tag::NONE) {
     tags->push_back(SearchResult::Tag(
         tag_styles, tag_start, text.length()));
   }
 }
 
-class OmniboxResult : public ChromeSearchResult {
+class OmniboxResult : public SearchResult {
  public:
   OmniboxResult(Profile* profile,
                 AutocompleteController* autocomplete_controller,
                 const AutocompleteMatch& match)
       : profile_(profile),
         autocomplete_controller_(autocomplete_controller),
         match_(match) {
     if (match_.search_terms_args) {
       match_.search_terms_args->from_app_list = true;
       autocomplete_controller_->UpdateMatchDestinationURL(
           *match_.search_terms_args, &match_);
     }
     set_id(match_.destination_url.spec());
 
     // Derive relevance from omnibox relevance and normalize it to [0, 1].
     // The magic number 1500 is the highest score of an omnibox result.
     // See comments in autocomplete_provider.h.
     set_relevance(match_.relevance / 1500.0);
 
     UpdateIcon();
     UpdateTitleAndDetails();
   }
   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);
     params.disposition = ui::DispositionFromEventFlags(event_flags);
     chrome::Navigate(&params);
   }
 
-  virtual void InvokeAction(int action_index, int event_flags) override {}
-
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() override {
-    return scoped_ptr<ChromeSearchResult>(
-        new OmniboxResult(profile_, autocomplete_controller_, match_)).Pass();
-  }
-
-  virtual ChromeSearchResultType GetType() override {
-    return OMNIBOX_SEARCH_RESULT;
+  virtual scoped_ptr<SearchResult> Duplicate() override {
+    return scoped_ptr<SearchResult>(
+        new OmniboxResult(profile_, autocomplete_controller_, match_));
   }
 
  private:
   void UpdateIcon() {
     BookmarkModel* bookmark_model =
         BookmarkModelFactory::GetForProfile(profile_);
     bool is_bookmarked =
         bookmark_model && bookmark_model->IsBookmarked(match_.destination_url);
     int resource_id = is_bookmarked ?
         IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
@@ skipping 61 matching lines @@
         new OmniboxResult(profile_, controller_.get(), *it)));
   }
 }
 
 void OmniboxProvider::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = controller_->result();
   PopulateFromACResult(result);
 }
 
 }  // namespace app_list