Revert of Expand scope of enable_hotwording.

chrome/browser/extensions/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//chrome/common/features.gni")
 
 assert(enable_extensions)
 
 gypi_values =
     exec_script("//build/gypi_to_gn.py",
                 [ rebase_path("../../chrome_browser_extensions.gypi") ],
                 "scope",
                 [ "../../chrome_browser_extensions.gypi" ])
 
 # GYP version: chrome/chrome_browser_extensions.gypi:browser_extensions
@@ skipping 84 matching lines @@
     "//ui/base",
     "//ui/base/ime",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/strings",
     "//url",
   ]
 
+  if (enable_task_manager) {
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_task_manager_enabled_sources,
+            ".",
+            "//chrome")
+  }
+
   if (is_chromeos) {
     sources +=
         rebase_path(gypi_values.chrome_browser_extensions_chromeos_sources,
                     ".",
                     "//chrome")
     sources -= [ "api/music_manager_private/device_id_linux.cc" ]
     if (use_dbus) {
       configs += [ "//build/config/linux/dbus" ]
     }
     deps += [
       "//components/chrome_apps",
       "//remoting/host/it2me:common",
       "//third_party/protobuf:protobuf_lite",
     ]
   } else {
     sources += [
       "default_apps.cc",
       "default_apps.h'",
     ]
     sources +=
         rebase_path(gypi_values.chrome_browser_extensions_non_chromeos_sources,
                     ".",
                     "//chrome")
   }
 
-  # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
-  if (is_chromeos || !use_x11) {
-    sources -= [
-      "global_shortcut_listener_x11.cc",
-      "global_shortcut_listener_x11.h",
+  if (enable_service_discovery) {
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_service_discovery_sources,
+            ".",
+            "//chrome")
+  }
+
+  if (use_ash) {
+    sources += [
+      "api/tabs/ash_panel_contents.cc",
+      "api/tabs/ash_panel_contents.h",
+    ]
+    deps += [ "//ash" ]
+  }
+
+  if (use_aura) {
+    deps += [
+      "//ui/keyboard",
+      "//ui/keyboard:keyboard_with_content",
+      "//ui/keyboard:resources",
     ]
   }
 
-  if (is_chromeos && use_ozone) {
-    sources -= [ "global_shortcut_listener_chromeos.cc" ]
-  }
-  if (!use_ozone) {
-    sources -= [ "global_shortcut_listener_ozone.cc" ]
+  if (toolkit_views) {
+    deps += [ "//ui/views" ]
   }
 
   if (is_linux) {
     deps += [ "//build/linux:fontconfig" ]
 
     if (use_dbus) {
       deps += [ "//dbus" ]
     }
 
     if (use_x11) {
       configs += [ "//build/config/linux:x11" ]
       deps += [
         "//ui/events:events_base",
         "//ui/events/platform",
         "//ui/events/platform/x11",
       ]
     }
     if (!is_chromeos) {
       sources += rebase_path(
               gypi_values.chrome_browser_extensions_input_ime_linux_win_sources,
               ".",
               "//chrome")
     }
   }
 
-  if (is_win || is_mac) {
-    deps += [ "//components/wifi" ]
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_networking_private_sources_winmac,
-            ".",
-            "//chrome")
-  }
-
-  if (is_win) {
-    deps += [
-      "//third_party/iaccessible2",
-      "//third_party/isimpledom",
-    ]
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_input_ime_linux_win_sources,
-            ".",
-            "//chrome")
-  } else if (use_aura && !is_chromeos) {
-    sources += [
-      "display_info_provider_aura.cc",
-      "display_info_provider_aura.h",
-    ]
-  }
-
-  if (enable_app_list) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_extensions_app_list_sources,
-                    ".",
-                    "//chrome")
-  }
-
-  if (enable_hotwording) {
-    defines += [ "ENABLE_HOTWORDING" ]
-  }
-
-  if (enable_service_discovery) {
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_service_discovery_sources,
-            ".",
-            "//chrome")
-  }
-
-  if (enable_task_manager) {
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_task_manager_enabled_sources,
-            ".",
-            "//chrome")
-  }
-
   if (enable_webrtc) {
     sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
   } else {
     sources +=
         [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
   }
 
-  if (toolkit_views) {
-    deps += [ "//ui/views" ]
-  }
-
-  if (use_ash) {
-    sources += [
-      "api/tabs/ash_panel_contents.cc",
-      "api/tabs/ash_panel_contents.h",
-    ]
-    deps += [ "//ash" ]
-  }
-
-  if (use_aura) {
-    deps += [
-      "//ui/keyboard",
-      "//ui/keyboard:keyboard_with_content",
-      "//ui/keyboard:resources",
-    ]
-  }
-
   if (use_brlapi) {
     deps += [ "//build/linux/libbrlapi" ]
     sources += rebase_path(gypi_values.chrome_browser_extensions_brlapi_sources,
                            ".",
                            "//chrome")
   } else {
     sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
   }
+
+  # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
+  if (is_chromeos || !use_x11) {
+    sources -= [
+      "global_shortcut_listener_x11.cc",
+      "global_shortcut_listener_x11.h",
+    ]
+  }
+
+  if (is_win || is_mac) {
+    deps += [ "//components/wifi" ]
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_networking_private_sources_winmac,
+            ".",
+            "//chrome")
+  }
+
+  if (is_win) {
+    deps += [
+      "//third_party/iaccessible2",
+      "//third_party/isimpledom",
+    ]
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_input_ime_linux_win_sources,
+            ".",
+            "//chrome")
+  } else if (use_aura && !is_chromeos) {
+    sources += [
+      "display_info_provider_aura.cc",
+      "display_info_provider_aura.h",
+    ]
+  }
+
+  if (enable_app_list) {
+    sources +=
+        rebase_path(gypi_values.chrome_browser_extensions_app_list_sources,
+                    ".",
+                    "//chrome")
+  }
+
+  if (is_chromeos && use_ozone) {
+    sources -= [ "global_shortcut_listener_chromeos.cc" ]
+  }
+  if (!use_ozone) {
+    sources -= [ "global_shortcut_listener_ozone.cc" ]
+  }
 }