Optimization: not sending answer server requests for voice queries.

chrome/browser/ui/app_list/app_list_view_delegate.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 "chrome/browser/ui/app_list/app_list_view_delegate.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 90 matching lines @@
     urls->push_back(extension->GetResourceURL(info->page));
   }
 }
 
 }  // namespace
 
 AppListViewDelegate::AppListViewDelegate(AppListControllerDelegate* controller)
     : controller_(controller),
       profile_(NULL),
       model_(NULL),
-      is_voice_query_(false),
       template_url_service_observer_(this) {
   CHECK(controller_);
   speech_ui_.reset(new app_list::SpeechUIModel);
 
 #if defined(GOOGLE_CHROME_BUILD)
   gfx::ImageSkia* image;
   {
     // TODO(tapted): Remove ScopedTracker below once crbug.com/431326 is fixed.
     tracked_objects::ScopedTracker tracking_profile(
         FROM_HERE_WITH_EXPLICIT_FUNCTION("431326 GetImageSkiaNamed()"));
@@ skipping 70 matching lines @@
     search_answer_delegate_ =
         base::MakeUnique<app_list::SearchAnswerWebContentsDelegate>(profile_,
                                                                     model_);
 
     SetUpSearchUI();
     SetUpCustomLauncherPages();
     OnTemplateURLServiceChanged();
   }
 
   // Clear search query.
-  model_->search_box()->SetText(base::string16());
+  model_->search_box()->Update(base::string16(), false);
 }
 
 void AppListViewDelegate::SetUpSearchUI() {
   app_list::StartPageService* start_page_service =
       app_list::StartPageService::Get(profile_);
   if (start_page_service)
     start_page_service->AddObserver(this);
 
   speech_ui_->SetSpeechRecognitionState(start_page_service
                                             ? start_page_service->state()
@@ skipping 57 matching lines @@
 app_list::AppListModel* AppListViewDelegate::GetModel() {
   return model_;
 }
 
 app_list::SpeechUIModel* AppListViewDelegate::GetSpeechUI() {
   return speech_ui_.get();
 }
 
 void AppListViewDelegate::StartSearch() {
   if (search_controller_) {
-    search_controller_->Start(is_voice_query_);
+    search_controller_->Start();
     controller_->OnSearchStarted();
   }
   if (search_answer_delegate_)
     search_answer_delegate_->Update();
 }
 
 void AppListViewDelegate::StopSearch() {
   if (search_controller_)
     search_controller_->Stop();
 }
 
 void AppListViewDelegate::OpenSearchResult(
     app_list::SearchResult* result,
     bool auto_launch,
     int event_flags) {
   if (auto_launch)
     base::RecordAction(base::UserMetricsAction("AppList_AutoLaunched"));
   search_controller_->OpenResult(result, event_flags);
-  is_voice_query_ = false;
 }
 
 void AppListViewDelegate::InvokeSearchResultAction(
     app_list::SearchResult* result,
     int action_index,
     int event_flags) {
   search_controller_->InvokeResultAction(result, action_index, event_flags);
 }
 
 base::TimeDelta AppListViewDelegate::GetAutoLaunchTimeout() {
   return auto_launch_timeout_;
 }
 
 void AppListViewDelegate::AutoLaunchCanceled() {
-  if (is_voice_query_) {
+  if (model_ && model_->search_box()->is_voice_query()) {
     base::RecordAction(base::UserMetricsAction("AppList_AutoLaunchCanceled"));
-    // Cancelling the auto launch means we are no longer in a voice query.
-    is_voice_query_ = false;
   }
   auto_launch_timeout_ = base::TimeDelta();
 }
 
 void AppListViewDelegate::ViewInitialized() {
   app_list::StartPageService* service =
       app_list::StartPageService::Get(profile_);
   if (service) {
     service->AppListShown();
     if (service->HotwordEnabled()) {
@@ skipping 86 matching lines @@
       hotword_service->StopHotwordSession(this);
   }
 }
 
 void AppListViewDelegate::OnSpeechResult(const base::string16& result,
                                          bool is_final) {
   speech_ui_->SetSpeechResult(result, is_final);
   if (is_final) {
     auto_launch_timeout_ = base::TimeDelta::FromMilliseconds(
         kAutoLaunchDefaultTimeoutMilliSec);
-    is_voice_query_ = true;
-    model_->search_box()->SetText(result);
+    model_->search_box()->Update(result, true);
   }
 }
 
 void AppListViewDelegate::OnSpeechSoundLevelChanged(int16_t level) {
   speech_ui_->UpdateSoundLevel(level);
 }
 
 void AppListViewDelegate::OnSpeechRecognitionStateChanged(
     app_list::SpeechRecognitionState new_state) {
   speech_ui_->SetSpeechRecognitionState(new_state, false);
@@ skipping 82 matching lines @@
   app_list::StartPageService* service =
       app_list::StartPageService::Get(profile_);
   return service && service->GetSpeechRecognitionContents();
 }
 
 void AppListViewDelegate::OnTemplateURLServiceChanged() {
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_);
   const TemplateURL* default_provider =
       template_url_service->GetDefaultSearchProvider();
   bool is_google =

[xiyuan, 2017/05/01 21:16:31]

nit: const , since you are here... :)

[vadimt, 2017/05/10 22:55:48]

Done.

       default_provider->GetEngineType(
           template_url_service->search_terms_data()) ==
       SEARCH_ENGINE_GOOGLE;
 
-  model_->SetSearchEngineIsGoogle(is_google);
-  search_answer_delegate_->Update();
+  if (model_->search_engine_is_google() != is_google) {

[xiyuan, 2017/05/01 21:16:31]

nit: Move this test to AppListModel::SetSearchEngineIsGoogle and maybe make
SearchAnswerWebContentsDelegate an AppListModelObserver ?

[vadimt, 2017/05/10 22:55:49]

Done.

+    model_->SetSearchEngineIsGoogle(is_google);
+    search_answer_delegate_->Update();
+  }
 
   app_list::StartPageService* start_page_service =
       app_list::StartPageService::Get(profile_);
   if (start_page_service)
     start_page_service->set_search_engine_is_google(is_google);
 }
 
 void AppListViewDelegate::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_APP_TERMINATING, type);
 
   SetProfile(nullptr);  // Ensures launcher page web contents are torn down.
 }