app_list: Implement local app search provider.

- Add AppSearchProvider based on pattern matching search;
- Add AppResult to represent an app search result;
- Rewire SearchResult actions to pass back a non-const pointer instead
  of a const reference since SearchResult is an actionable object instead
  of static data now;
- Deprecating old SearchBuilder;

BUG=173427

Review URL: https://chromiumcodereview.appspot.com/15198004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200491 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 20 insertions, 21 deletions

diff --git a/ui/app_list/app_list_view_delegate.h b/ui/app_list/app_list_view_delegate.h
index 21e6f61..d5567e7 100644
--- a/ui/app_list/app_list_view_delegate.h
+++ b/ui/app_list/app_list_view_delegate.h
@@ -44,12 +44,11 @@ class APP_LIST_EXPORT AppListViewDelegate {
   virtual void StopSearch() = 0;
 
   // Invoked to open the search result.
-  virtual void OpenSearchResult(const SearchResult& result,
-                                int event_flags) = 0;
+  virtual void OpenSearchResult(SearchResult* result, int event_flags) = 0;
 
   // Called to invoke a custom action on |result|.  |action_index| corresponds
   // to the index of an icon in |result.action_icons()|.
-  virtual void InvokeSearchResultAction(const SearchResult& result,
+  virtual void InvokeSearchResultAction(SearchResult* result,
                                         int action_index,
                                         int event_flags) = 0;
 
diff --git a/ui/app_list/search_result_list_view_delegate.h b/ui/app_list/search_result_list_view_delegate.h
index 3022e3f..097c612 100644
--- a/ui/app_list/search_result_list_view_delegate.h
+++ b/ui/app_list/search_result_list_view_delegate.h
@@ -16,12 +16,12 @@ class APP_LIST_EXPORT SearchResultListViewDelegate {
   // Invoked to open given |result|. |event_flags| contains the flags of the
   // keyboard/mouse event that triggers the "open" request. Delegate could use
   // the |event_flags| information to choose different ways to open the result.
-  virtual void OpenResult(const SearchResult& result,
+  virtual void OpenResult(SearchResult* result,
                           int event_flags) = 0;
 
   // Called to invoke a custom action on |result|.  |action_index| corresponds
   // to the index of the icon in |result.action_icons()| that was activated.
-  virtual void InvokeResultAction(const SearchResult& result,
+  virtual void InvokeResultAction(SearchResult* result,
                                   int action_index,
                                   int event_flags) = 0;
 
diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h
index 4516186..4002d3a 100644
--- a/ui/app_list/test/app_list_test_view_delegate.h
+++ b/ui/app_list/test/app_list_test_view_delegate.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H
-#define UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H
+#ifndef UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
+#define UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "ui/app_list/app_list_view_delegate.h"
 
 namespace app_list {
-namespace test{
+namespace test {
 
 // A concrete AppListViewDelegate for unit tests.
 class AppListTestViewDelegate  : public AppListViewDelegate {
@@ -28,9 +28,9 @@ class AppListTestViewDelegate  : public AppListViewDelegate {
                                    int event_flags) OVERRIDE;
   virtual void StartSearch() OVERRIDE {}
   virtual void StopSearch() OVERRIDE {}
-  virtual void OpenSearchResult(const SearchResult& result,
+  virtual void OpenSearchResult(SearchResult* result,
                                 int event_flags) OVERRIDE {}
-  virtual void InvokeSearchResultAction(const SearchResult& result,
+  virtual void InvokeSearchResultAction(SearchResult* result,
                                         int action_index,
                                         int event_flags) OVERRIDE {}
   virtual void Dismiss() OVERRIDE;
@@ -42,7 +42,7 @@ class AppListTestViewDelegate  : public AppListViewDelegate {
   virtual void OpenSettings() OVERRIDE {}
   virtual void OpenFeedback() OVERRIDE {}
 
-private:
+ private:
   int activate_count_;
   int dismiss_count_;
   AppListItemModel* last_activated_;
@@ -51,4 +51,4 @@ private:
 }  // namespace test
 }  // namespace app_list
 
-#endif  // UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H
+#endif  // UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index c7b11d10..be53492 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -60,8 +60,8 @@ class AppListMainView::IconLoader : public AppListItemModelObserver {
   }
   virtual void ItemTitleChanged() OVERRIDE {}
   virtual void ItemHighlightedChanged() OVERRIDE {}
-  virtual void ItemIsInstallingChanged() OVERRIDE {};
-  virtual void ItemPercentDownloadedChanged() OVERRIDE {};
+  virtual void ItemIsInstallingChanged() OVERRIDE {}
+  virtual void ItemPercentDownloadedChanged() OVERRIDE {}
 
   AppListMainView* owner_;
   AppListItemModel* item_;
@@ -202,12 +202,12 @@ void AppListMainView::QueryChanged(SearchBoxView* sender) {
   }
 }
 
-void AppListMainView::OpenResult(const SearchResult& result, int event_flags) {
+void AppListMainView::OpenResult(SearchResult* result, int event_flags) {
   if (delegate_)
     delegate_->OpenSearchResult(result, event_flags);
 }
 
-void AppListMainView::InvokeResultAction(const SearchResult& result,
+void AppListMainView::InvokeResultAction(SearchResult* result,
                                          int action_index,
                                          int event_flags) {
   if (delegate_)
diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h
index 68513a9..c962e17 100644
--- a/ui/app_list/views/app_list_main_view.h
+++ b/ui/app_list/views/app_list_main_view.h
@@ -74,9 +74,9 @@ class AppListMainView : public views::View,
   virtual void QueryChanged(SearchBoxView* sender) OVERRIDE;
 
   // Overridden from SearchResultListViewDelegate:
-  virtual void OpenResult(const SearchResult& result,
+  virtual void OpenResult(SearchResult* result,
                           int event_flags) OVERRIDE;
-  virtual void InvokeResultAction(const SearchResult& result,
+  virtual void InvokeResultAction(SearchResult* result,
                                   int action_index,
                                   int event_flags) OVERRIDE;
 
diff --git a/ui/app_list/views/search_result_list_view.cc b/ui/app_list/views/search_result_list_view.cc
index 8364257..bdb8b32 100644
--- a/ui/app_list/views/search_result_list_view.cc
+++ b/ui/app_list/views/search_result_list_view.cc
@@ -156,7 +156,7 @@ void SearchResultListView::ListItemsChanged(size_t start, size_t count) {
 void SearchResultListView::SearchResultActivated(SearchResultView* view,
                                                  const ui::Event& event) {
   if (delegate_ && view->result())
-    delegate_->OpenResult(*(view->result()), event.flags());
+    delegate_->OpenResult(view->result(), event.flags());
 }
 
 void SearchResultListView::SearchResultActionActivated(SearchResultView* view,
@@ -164,7 +164,7 @@ void SearchResultListView::SearchResultActionActivated(SearchResultView* view,
                                                        const ui::Event& event) {
   if (delegate_ && view->result()) {
     delegate_->InvokeResultAction(
-        *(view->result()), action_index, event.flags());
+        view->result(), action_index, event.flags());
   }
 }
 
diff --git a/ui/app_list/views/search_result_view.h b/ui/app_list/views/search_result_view.h
index 55cb35c..08135fd 100644
--- a/ui/app_list/views/search_result_view.h
+++ b/ui/app_list/views/search_result_view.h
@@ -45,7 +45,7 @@ class SearchResultView : public views::CustomButton,
 
   // Sets/gets SearchResult displayed by this view.
   void SetResult(SearchResult* result);
-  const SearchResult* result() const { return result_; }
+  SearchResult* result() { return result_; }
 
   // Clears reference to SearchResult but don't schedule repaint.
   void ClearResultNoRepaint();