Revert 281908 "Revert of Remove disable-app-list-voice-search fl..."

trunk/src/ui/app_list/app_list_switches.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 "ui/app_list/app_list_switches.h"
 
 #include "base/command_line.h"
 
 namespace app_list {
 namespace switches {
 
 // If set, the app info context menu item is not available in the app list UI.
 const char kDisableAppInfo[] = "disable-app-list-app-info";
 
 // Disables syncing of the app list independent of extensions.
 const char kDisableSyncAppList[] = "disable-sync-app-list";
 
-// If set, the voice search is disabled in app list UI.
-const char kDisableVoiceSearch[] = "disable-app-list-voice-search";
-
 // If set, the app list will be centered and wide instead of tall.
 const char kEnableCenteredAppList[] = "enable-centered-app-list";
 
 // If set, Drive apps of the user shows side-by-side with Chrome apps.
 const char kEnableDriveAppsInAppList[] = "enable-drive-apps-in-app-list";
 
 // If set, the experimental app list will be used. Implies
 // --enable-centered-app-list.
 const char kEnableExperimentalAppList[] = "enable-experimental-app-list";
 
@@ skipping 13 matching lines @@
   return false;  // Folder UI not implemented for Cocoa.
 #endif
   // Folder UI is available only when AppList sync is enabled, and should
   // not be disabled separately.
   return IsAppListSyncEnabled();
 }
 
 bool IsVoiceSearchEnabled() {
   // Speech recognition in AppList is only for ChromeOS right now.
 #if defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableVoiceSearch);
+  return true;
 #else
   return false;
 #endif
 }
 
 bool IsAppInfoEnabled() {
 #if defined(TOOLKIT_VIEWS)
   return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableAppInfo);
 #else
   return false;
 #endif
 }
 
 bool IsExperimentalAppListEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       kEnableExperimentalAppList);
 }
 
 bool IsCenteredAppListEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(kEnableCenteredAppList) ||
          IsExperimentalAppListEnabled();
 }
 
 bool IsDriveAppsInAppListEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(kEnableDriveAppsInAppList);
 }
 
 }  // namespace switches
 }  // namespace app_list