Introduces UMA for app-list voice search.

This CL adds 6 user actions (prefixed by 'AppList_')
- AutoLaunchCanceled
- AutoLaunched
- HotwordRecognized
- SearchedBySpeech
- VoiceSearchCanceled
- VoiceSearchStartedManually

BUG=341239
R=xiyuan@chromium.org
TBR=oshima@chromium.org

Review URL: https://codereview.chromium.org/151903007

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

8 files changed, 21 insertions, 9 deletions

diff --git a/ui/app_list/app_list_view_delegate.h b/ui/app_list/app_list_view_delegate.h
index 3d550ac..aac3f35 100644
--- a/ui/app_list/app_list_view_delegate.h
+++ b/ui/app_list/app_list_view_delegate.h
@@ -91,7 +91,9 @@ class APP_LIST_EXPORT AppListViewDelegate {
   virtual void StopSearch() = 0;
 
   // Invoked to open the search result.
-  virtual void OpenSearchResult(SearchResult* result, int event_flags) = 0;
+  virtual void OpenSearchResult(SearchResult* result,
+                                bool auto_launch,
+                                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()|.
diff --git a/ui/app_list/cocoa/app_list_view_controller.mm b/ui/app_list/cocoa/app_list_view_controller.mm
index 3d9b167..7bf0e3a 100644
--- a/ui/app_list/cocoa/app_list_view_controller.mm
+++ b/ui/app_list/cocoa/app_list_view_controller.mm
@@ -348,8 +348,10 @@ void AppListModelObserverBridge::OnProfilesChanged() {
 }
 
 - (void)openResult:(app_list::SearchResult*)result {
-  if (delegate_)
-    delegate_->OpenSearchResult(result, 0 /* event flags */);
+  if (delegate_) {
+    delegate_->OpenSearchResult(
+        result, false /* auto_launch */, 0 /* event flags */);
+  }
 }
 
 - (void)redoSearch {
diff --git a/ui/app_list/test/app_list_test_view_delegate.cc b/ui/app_list/test/app_list_test_view_delegate.cc
index 202da6e..dfe82f5 100644
--- a/ui/app_list/test/app_list_test_view_delegate.cc
+++ b/ui/app_list/test/app_list_test_view_delegate.cc
@@ -89,6 +89,7 @@ void AppListTestViewDelegate::GetShortcutPathForApp(
 }
 
 void AppListTestViewDelegate::OpenSearchResult(SearchResult* result,
+                                               bool auto_launch,
                                                int event_flags) {
   ++open_search_result_count_;
 }
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 18bf3ff..c723397 100644
--- a/ui/app_list/test/app_list_test_view_delegate.h
+++ b/ui/app_list/test/app_list_test_view_delegate.h
@@ -48,6 +48,7 @@ class AppListTestViewDelegate : public AppListViewDelegate {
   virtual void StartSearch() OVERRIDE {}
   virtual void StopSearch() OVERRIDE {}
   virtual void OpenSearchResult(SearchResult* result,
+                                bool auto_launch,
                                 int event_flags) OVERRIDE;
   virtual void InvokeSearchResultAction(SearchResult* result,
                                         int action_index,
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index 7d2f6b7..ed7a771 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -226,8 +226,10 @@ void AppListMainView::QueryChanged(SearchBoxView* sender) {
     delegate_->StopSearch();
 }
 
-void AppListMainView::OpenResult(SearchResult* result, int event_flags) {
-  delegate_->OpenSearchResult(result, event_flags);
+void AppListMainView::OpenResult(SearchResult* result,
+                                 bool auto_launch,
+                                 int event_flags) {
+  delegate_->OpenSearchResult(result, auto_launch, event_flags);
 }
 
 void AppListMainView::InvokeResultAction(SearchResult* result,
diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h
index 07d360d..d680476d 100644
--- a/ui/app_list/views/app_list_main_view.h
+++ b/ui/app_list/views/app_list_main_view.h
@@ -86,6 +86,7 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
 
   // Overridden from SearchResultListViewDelegate:
   virtual void OpenResult(SearchResult* result,
+                          bool auto_launch,
                           int event_flags) OVERRIDE;
   virtual void InvokeResultAction(SearchResult* result,
                                   int action_index,
diff --git a/ui/app_list/views/search_result_list_view.cc b/ui/app_list/views/search_result_list_view.cc
index 28fe335..467fc23 100644
--- a/ui/app_list/views/search_result_list_view.cc
+++ b/ui/app_list/views/search_result_list_view.cc
@@ -201,7 +201,7 @@ void SearchResultListView::VisibilityChanged(views::View* starting_from,
 
 void SearchResultListView::AnimationEnded(const gfx::Animation* animation) {
   DCHECK_EQ(auto_launch_animation_.get(), animation);
-  delegate_->OpenResult(results_->GetItemAt(0), ui::EF_NONE);
+  delegate_->OpenResult(results_->GetItemAt(0), true, ui::EF_NONE);
 }
 
 void SearchResultListView::AnimationProgressed(
@@ -237,7 +237,7 @@ void SearchResultListView::ListItemsChanged(size_t start, size_t count) {
 void SearchResultListView::SearchResultActivated(SearchResultView* view,
                                                  int event_flags) {
   if (delegate_ && view->result())
-    delegate_->OpenResult(view->result(), event_flags);
+    delegate_->OpenResult(view->result(), false, event_flags);
 }
 
 void SearchResultListView::SearchResultActionActivated(SearchResultView* view,
diff --git a/ui/app_list/views/search_result_list_view_delegate.h b/ui/app_list/views/search_result_list_view_delegate.h
index 405094b..e173287 100644
--- a/ui/app_list/views/search_result_list_view_delegate.h
+++ b/ui/app_list/views/search_result_list_view_delegate.h
@@ -14,9 +14,12 @@ class SearchResult;
 class APP_LIST_EXPORT SearchResultListViewDelegate {
  public:
   // 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.
+  // keyboard/mouse event that triggers the "open" request. |auto_launch| is
+  // true when the result is opened automatically through voice-search. Delegate
+  // could use the |event_flags| information to choose different ways to open
+  // the result.
   virtual void OpenResult(SearchResult* result,
+                          bool auto_launch,
                           int event_flags) = 0;
 
   // Called to invoke a custom action on |result|.  |action_index| corresponds