Move //chromeos/{=>ash/components}/language

This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Change-Id: I4fa3f5110aaa9fd7d3cecea3a5cc751fd1f3c5c1 Bug: 1164001 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3676573 Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Reviewed-by: Claudio M <claudiomagni@chromium.org> Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Cr-Commit-Position: refs/heads/main@{#1041875}
Denger-Network · Sep 1, 2022 · be21a99 · be21a99
1 parent c07d5c2
commit be21a99
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 22 deletions.
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
@@ -323,6 +323,8 @@ source_set("chromeos") {
     "//chromeos/ash/components/feature_usage",
     "//chromeos/ash/components/hibernate:buildflags",
     "//chromeos/ash/components/install_attributes",
+    "//chromeos/ash/components/language/language_packs",
+    "//chromeos/ash/components/language/public/mojom",
     "//chromeos/ash/components/local_search_service/public/cpp",
     "//chromeos/ash/components/memory",
     "//chromeos/ash/components/network",
@@ -364,8 +366,6 @@ source_set("chromeos") {
     "//chromeos/dbus/u2f",
     "//chromeos/dbus/u2f:u2f_proto",
     "//chromeos/ime:gencode",
-    "//chromeos/language/language_packs",
-    "//chromeos/language/public/mojom",
     "//chromeos/login/login_state",
     "//chromeos/printing",
     "//chromeos/services/bluetooth_config:in_process_bluetooth_config",

diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
@@ -1171,11 +1171,11 @@ static_library("extensions") {
       "//chromeos/ash/components/dbus/update_engine",
       "//chromeos/ash/components/disks",
       "//chromeos/ash/components/enhanced_network_tts/mojom",
+      "//chromeos/ash/components/language/language_packs",
+      "//chromeos/ash/components/language/public/mojom",
       "//chromeos/ash/components/network",
       "//chromeos/ash/services/assistant/public/cpp",
       "//chromeos/components/remote_apps/mojom",
-      "//chromeos/language/language_packs",
-      "//chromeos/language/public/mojom",
       "//chromeos/login/login_state",
       "//chromeos/process_proxy",
       "//chromeos/services/machine_learning/public/cpp",

diff --git a/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc b/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc
@@ -31,9 +31,9 @@
 #include "chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chromeos/ash/components/enhanced_network_tts/mojom/enhanced_network_tts.mojom.h"
+#include "chromeos/ash/components/language/language_packs/language_packs_impl.h"
+#include "chromeos/ash/components/language/public/mojom/language_packs.mojom.h"
 #include "chromeos/components/remote_apps/mojom/remote_apps.mojom.h"
-#include "chromeos/language/language_packs/language_packs_impl.h"
-#include "chromeos/language/public/mojom/language_packs.mojom.h"
 #include "chromeos/services/media_perception/public/mojom/media_perception.mojom.h"
 #include "chromeos/services/tts/public/mojom/tts_service.mojom.h"
 #include "extensions/browser/api/extensions_api_client.h"

diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
@@ -121,7 +121,6 @@ test("chromeos_unittests") {
       "//chromeos/crosapi/cpp:unit_tests",
       "//chromeos/crosapi/mojom:unit_tests",
       "//chromeos/dbus:unit_tests",
-      "//chromeos/language/language_packs:unit_tests",
       "//chromeos/login/login_state:unit_tests",
       "//chromeos/printing:unit_tests",
       "//chromeos/process_proxy:unit_tests",

diff --git a/chromeos/ash/components/BUILD.gn b/chromeos/ash/components/BUILD.gn
@@ -22,6 +22,7 @@ source_set("unit_tests") {
     "//chromeos/ash/components/feature_usage:unit_tests",
     "//chromeos/ash/components/human_presence:unit_tests",
     "//chromeos/ash/components/install_attributes:unit_tests",
+    "//chromeos/ash/components/language/language_packs:unit_tests",
     "//chromeos/ash/components/local_search_service:unit_tests",
     "//chromeos/ash/components/local_search_service/public/mojom:unit_tests",
     "//chromeos/ash/components/memory:unit_tests",

diff --git a/chromeos/language/DIR_METADATA → ...meos/ash/components/language/DIR_METADATA b/chromeos/language/DIR_METADATA → ...meos/ash/components/language/DIR_METADATA
diff --git a/chromeos/language/OWNERS → chromeos/ash/components/language/OWNERS b/chromeos/language/OWNERS → chromeos/ash/components/language/OWNERS
diff --git a/chromeos/language/language_packs/BUILD.gn → ...mponents/language/language_packs/BUILD.gn b/chromeos/language/language_packs/BUILD.gn → ...mponents/language/language_packs/BUILD.gn
@@ -2,7 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+import("//build/config/chromeos/ui_mode.gni")
+
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //chromeos/ash")
 
 static_library("language_packs") {
   sources = [
@@ -13,9 +15,9 @@ static_library("language_packs") {
   ]
   deps = [
     "//base",
+    "//chromeos/ash/components/language/public/mojom",
     "//chromeos/dbus/dlcservice:dlcservice",
     "//chromeos/dbus/dlcservice:dlcservice_proto",
-    "//chromeos/language/public/mojom",
   ]
 }
 

diff --git a/chromeos/language/language_packs/README.md → ...ponents/language/language_packs/README.md b/chromeos/language/language_packs/README.md → ...ponents/language/language_packs/README.md
diff --git a/...e/language_packs/language_pack_manager.cc → ...e/language_packs/language_pack_manager.cc b/...e/language_packs/language_pack_manager.cc → ...e/language_packs/language_pack_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/language/language_packs/language_pack_manager.h"
+#include "chromeos/ash/components/language/language_packs/language_pack_manager.h"
 
 #include "base/bind.h"
 #include "base/callback.h"

diff --git a/...ge/language_packs/language_pack_manager.h → ...ge/language_packs/language_pack_manager.h b/...ge/language_packs/language_pack_manager.h → ...ge/language_packs/language_pack_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACK_MANAGER_H_
-#define CHROMEOS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACK_MANAGER_H_
+#ifndef CHROMEOS_ASH_COMPONENTS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACK_MANAGER_H_
+#define CHROMEOS_ASH_COMPONENTS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACK_MANAGER_H_
 
 #include <string>
 
@@ -173,4 +173,4 @@ class LanguagePackManager : public DlcserviceClient::Observer {
 
 }  // namespace chromeos::language_packs
 
-#endif  // CHROMEOS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACK_MANAGER_H_
+#endif  // CHROMEOS_ASH_COMPONENTS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACK_MANAGER_H_
diff --git a/...e_packs/language_pack_manager_unittest.cc → ...e_packs/language_pack_manager_unittest.cc b/...e_packs/language_pack_manager_unittest.cc → ...e_packs/language_pack_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/language/language_packs/language_pack_manager.h"
+#include "chromeos/ash/components/language/language_packs/language_pack_manager.h"
 
 #include "base/bind.h"
 #include "base/logging.h"

diff --git a/...age/language_packs/language_packs_impl.cc → ...age/language_packs/language_packs_impl.cc b/...age/language_packs/language_packs_impl.cc → ...age/language_packs/language_packs_impl.cc
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "base/metrics/histogram_functions.h"
-#include "chromeos/language/language_packs/language_packs_impl.h"
+#include "chromeos/ash/components/language/language_packs/language_packs_impl.h"
 
 #include "base/no_destructor.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

diff --git a/...uage/language_packs/language_packs_impl.h → ...uage/language_packs/language_packs_impl.h b/...uage/language_packs/language_packs_impl.h → ...uage/language_packs/language_packs_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACKS_IMPL_H_
-#define CHROMEOS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACKS_IMPL_H_
+#ifndef CHROMEOS_ASH_COMPONENTS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACKS_IMPL_H_
+#define CHROMEOS_ASH_COMPONENTS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACKS_IMPL_H_
 
 #include <string>
 
-#include "chromeos/language/language_packs/language_pack_manager.h"
-#include "chromeos/language/public/mojom/language_packs.mojom.h"
+#include "chromeos/ash/components/language/language_packs/language_pack_manager.h"
+#include "chromeos/ash/components/language/public/mojom/language_packs.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 
@@ -44,4 +44,4 @@ class LanguagePacksImpl : public chromeos::language::mojom::LanguagePacks {
 
 }  // namespace chromeos::language_packs
 
-#endif  // CHROMEOS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACKS_IMPL_H_
+#endif  // CHROMEOS_ASH_COMPONENTS_LANGUAGE_LANGUAGE_PACKS_LANGUAGE_PACKS_IMPL_H_
diff --git a/...nguage/language_packs/metrics_unittest.cc → ...nguage/language_packs/metrics_unittest.cc b/...nguage/language_packs/metrics_unittest.cc → ...nguage/language_packs/metrics_unittest.cc
diff --git a/chromeos/language/public/mojom/BUILD.gn → ...components/language/public/mojom/BUILD.gn b/chromeos/language/public/mojom/BUILD.gn → ...components/language/public/mojom/BUILD.gn
@@ -2,8 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //chromeos/ash")
+
 mojom("mojom") {
   sources = [ "language_packs.mojom" ]
   public_deps = [ "//mojo/public/mojom/base" ]

diff --git a/chromeos/language/public/mojom/OWNERS → ...h/components/language/public/mojom/OWNERS b/chromeos/language/public/mojom/OWNERS → ...h/components/language/public/mojom/OWNERS
diff --git a/...anguage/public/mojom/language_packs.mojom → ...anguage/public/mojom/language_packs.mojom b/...anguage/public/mojom/language_packs.mojom → ...anguage/public/mojom/language_packs.mojom
diff --git a/chromeos/ash/resources/BUILD.gn b/chromeos/ash/resources/BUILD.gn
@@ -32,6 +32,7 @@ grit("resources") {
     "//ash/services/device_sync/public/mojom:mojom_js",
     "//ash/services/multidevice_setup/public/mojom:mojom_js",
     "//chromeos/ash/components/human_presence:human_presence_internals_ts",
+    "//chromeos/ash/components/language/public/mojom:mojom_js",
     "//chromeos/ash/services/auth_factor_config/public/mojom:mojom_js",
   ]
 }
diff --git a/chromeos/resources/BUILD.gn b/chromeos/resources/BUILD.gn
@@ -23,7 +23,6 @@ grit("resources") {
   ]
 
   deps = [
-    "//chromeos/language/public/mojom:mojom_js",
     "//chromeos/services/bluetooth_config/public/mojom:mojom_js",
 
     # Generated ml service js bindings are required by external clients, the

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
@@ -54070,7 +54070,7 @@ Unsupported non-ascii characters will cause issues with xml presubmits.
     Hash values of language codes that correspond to a Language Pack. The hash
     is created by computing base::PersistentHash() of the label, then cast to
     int32. To generate new values in a way that is consistent, use the unit test
-    at chromeos/language/language_packs/metrics_unittest.cc.
+    at chromeos/ash/components/language/language_packs/metrics_unittest.cc.
   </summary>
   <int value="-1954182822" label="et"/>
   <int value="-1902856059" label="tr"/>