Treat regular and always-on hotwording settings as mutually exclusive.

chrome/browser/ui/app_list/start_page_service.cc

 // Copyright 2013 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/start_page_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 156 matching lines @@
         "appList.startPage.toggleSpeechRecognition");
   } else {
     pending_webui_callbacks_.push_back(
         base::Bind(&StartPageService::ToggleSpeechRecognition,
                    base::Unretained(this)));
   }
 }
 
 bool StartPageService::HotwordEnabled() {
   if (HotwordService::IsExperimentalHotwordingEnabled()) {
+    auto prefs = profile_->GetPrefs();
     return HotwordServiceFactory::IsServiceAvailable(profile_) &&
-        profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled);
+        (prefs->GetBoolean(prefs::kHotwordSearchEnabled) ||
+         prefs->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
   }
 #if defined(OS_CHROMEOS)
   return HotwordServiceFactory::IsServiceAvailable(profile_) &&
       profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled);
 #else
   return false;
 #endif
 }
 
 content::WebContents* StartPageService::GetStartPageContents() {
@@ skipping 83 matching lines @@
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }
 
 void StartPageService::UnloadContents() {
   contents_.reset();
   webui_finished_loading_ = false;
 }
 
 }  // namespace app_list