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

ui/app_list/search_result_list_view.cc

 // Copyright (c) 2012 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 "ui/app_list/search_result_list_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 65 matching lines @@
 bool SearchResultListView::OnKeyPressed(const ui::KeyEvent& event) {
   switch (event.key_code()) {
     case ui::VKEY_UP:
       SetSelectedIndex(std::max(selected_index_ - 1, 0));
       return true;
     case ui::VKEY_DOWN:
       SetSelectedIndex(std::min(selected_index_ + 1, last_visible_index_));
       return true;
     case ui::VKEY_RETURN:
       if (selected_index_ >= 0)
-        ButtonPressed(GetResultViewAt(selected_index_), event);
+        SearchResultActivated(GetResultViewAt(selected_index_), event);
       return true;
     default:
       break;
   }
   return false;
 }
 
 SearchResultView* SearchResultListView::GetResultViewAt(int index) {
   DCHECK(index >= 0 && index < child_count());
   return static_cast<SearchResultView*>(child_at(index));
@@ skipping 23 matching lines @@
   // When search results are added one by one, each addition generates an update
   // request. Consolidates those update requests into one Update call.
   if (!update_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&SearchResultListView::Update,
                    update_factory_.GetWeakPtr()));
   }
 }
 
-void SearchResultListView::ButtonPressed(views::Button* sender,
-                                         const ui::Event& event) {
-  if (sender->GetClassName() != SearchResultView::kViewClassName)
-    return;
-
-  if (delegate_) {
-    const SearchResult* result =
-        static_cast<SearchResultView*>(sender)->result();
-
-    if (result)
-      delegate_->OpenResult(*result, event.flags());
-  }
-}
-
 void SearchResultListView::ListItemsAdded(size_t start, size_t count) {
   ScheduleUpdate();
 }
 
 void SearchResultListView::ListItemsRemoved(size_t start, size_t count) {
   size_t last = std::min(start + count, static_cast<size_t>(child_count()));
   for (size_t i = start; i < last; ++i)
     GetResultViewAt(i)->ClearResultNoRepaint();
 
   ScheduleUpdate();
 }
 
 void SearchResultListView::ListItemsChanged(size_t start, size_t count) {
   ScheduleUpdate();
 }
 
+void SearchResultListView::SearchResultActivated(SearchResultView* view,
+                                                 const ui::Event& event) {
+  if (delegate_ && view->result())
+    delegate_->OpenResult(*(view->result()), event.flags());
+}
+
+void SearchResultListView::SearchResultActionActivated(SearchResultView* view,
+                                                       int action_index,
+                                                       const ui::Event& event) {
+  if (delegate_ && view->result()) {
+    delegate_->InvokeResultAction(
+        *(view->result()), action_index, event.flags());
+  }
+}
+
 }  // namespace app_list