Expand scope of enable_hotwording. (try 2)

chrome/browser/extensions/BUILD.gn

Index: chrome/browser/extensions/BUILD.gn
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 0000525f551df92f7f28ad73327064df6f87628e..4ec2b76c163af6b72ed2afecf7e7c4d76cab0960 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//chrome/common/features.gni")
 
 assert(enable_extensions)
 
@@ -108,13 +109,6 @@ static_library("extensions") {
     "//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,
@@ -128,6 +122,7 @@ static_library("extensions") {
       "//components/chrome_apps",
       "//remoting/host/it2me:common",
       "//third_party/protobuf:protobuf_lite",
+      "//ui/file_manager:resources",
     ]
   } else {
     sources += [
@@ -140,31 +135,19 @@ static_library("extensions") {
                     "//chrome")
   }
 
-  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",
+  # 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",
     ]
-    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 (toolkit_views) {
-    deps += [ "//ui/views" ]
+  if (!use_ozone) {
+    sources -= [ "global_shortcut_listener_ozone.cc" ]
   }
 
   if (is_linux) {
@@ -190,30 +173,6 @@ static_library("extensions") {
     }
   }
 
-  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 (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(
@@ -245,10 +204,57 @@ static_library("extensions") {
                     "//chrome")
   }
 
-  if (is_chromeos && use_ozone) {
-    sources -= [ "global_shortcut_listener_chromeos.cc" ]
+  if (enable_hotwording) {
+    defines += [ "ENABLE_HOTWORDING" ]
   }
-  if (!use_ozone) {
-    sources -= [ "global_shortcut_listener_ozone.cc" ]
+
+  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" ]
   }
 }