ash: Add support for additional icons in apps search list.

ui/app_list/search_result_list_view.h

Index: ui/app_list/search_result_list_view.h
diff --git a/ui/app_list/search_result_list_view.h b/ui/app_list/search_result_list_view.h
index 90311d5f71eb50a44890fa182db6513e6810ed39..8f0ca93b1daf5036aec436c318bc398917f3de59 100644
--- a/ui/app_list/search_result_list_view.h
+++ b/ui/app_list/search_result_list_view.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/app_list/search_result_view_delegate.h"
 #include "ui/base/models/list_model_observer.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace app_list {
@@ -20,8 +20,8 @@ class SearchResultView;
 // SearchResultListView displays AppListModel::SearchResults with a list of
 // SearchResultView.
 class SearchResultListView : public views::View,
-                             public views::ButtonListener,
-                             public ui::ListModelObserver {
+                             public ui::ListModelObserver,
+                             public SearchResultViewDelegate {
  public:
   explicit SearchResultListView(SearchResultListViewDelegate* delegate);
   virtual ~SearchResultListView();
@@ -46,15 +46,18 @@ class SearchResultListView : public views::View,
   // pending call.
   void ScheduleUpdate();
 
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
-
   // Overridden from ListModelObserver:
   virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE;
   virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE;
   virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE;
 
+  // Overridden from SearchResultViewDelegate:
+  virtual void SearchResultActivated(SearchResultView* view,
+                                     const ui::Event& event) OVERRIDE;
+  virtual void SearchResultActionActivated(SearchResultView* view,
+                                           int action_index,
+                                           const ui::Event& event) OVERRIDE;
+
   SearchResultListViewDelegate* delegate_;  // Not owned.
   AppListModel::SearchResults* results_;  // Owned by AppListModel.