Remove //components/typemaps.gni

All typemaps listed here are deleted and their configurations are merged into their respective mojom targets. Bug: 1059389 Change-Id: I94cd40f48f7ee80de7f284bf446d4e9e80939810 Tbr: xiyuan@chromium.org Tbr: estade@chromium.org Tbr: changwan@chromium.org Tbr: engedy@chromium.org Tbr: dschuff@chromium.org Tbr: jdoerrie@chromium.org Tbr: jds@chromium.org Tbr: megjablon@chromium.org Tbr: blundell@chromium.org Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405438 Reviewed-by: Evan Stade <estade@chromium.org> Reviewed-by: Derek Schuff <dschuff@chromium.org> Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org> Reviewed-by: Changwan Ryu <changwan@chromium.org> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Reviewed-by: Robert Sesek <rsesek@chromium.org> Reviewed-by: Megan Jablonski <megjablon@chromium.org> Reviewed-by: Colin Blundell <blundell@chromium.org> Reviewed-by: Balazs Engedy <engedy@chromium.org> Commit-Queue: Ken Rockot <rockot@google.com> Cr-Commit-Position: refs/heads/master@{#807148}
FairyWorld · Sep 15, 2020 · 78e2186 · 78e2186
1 parent 7b49a28
commit 78e2186
Show file tree

Hide file tree

Showing 30 changed files with 233 additions and 234 deletions.
diff --git a/components/account_id/mojom/BUILD.gn b/components/account_id/mojom/BUILD.gn
@@ -6,4 +6,21 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [ "account_id.mojom" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "signin.mojom.AccountType"
+          cpp = "::AccountType"
+        },
+        {
+          mojom = "signin.mojom.AccountId"
+          cpp = "::AccountId"
+        },
+      ]
+      traits_headers = [ "account_id_traits.h" ]
+      traits_public_deps = [ "//components/account_id" ]
+    },
+  ]
 }
diff --git a/components/account_id/mojom/OWNERS b/components/account_id/mojom/OWNERS
@@ -1,4 +1,2 @@
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/components/account_id/mojom/account_id.typemap b/components/account_id/mojom/account_id.typemap
diff --git a/components/autofill/core/common/mojom/BUILD.gn b/components/autofill/core/common/mojom/BUILD.gn
@@ -14,6 +14,83 @@ mojom("mojo_types") {
     "//url/mojom:url_mojom_gurl",
     "//url/mojom:url_mojom_origin",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "autofill.mojom.FormData"
+          cpp = "::autofill::FormData"
+        },
+        {
+          mojom = "autofill.mojom.FormDataPredictions"
+          cpp = "::autofill::FormDataPredictions"
+        },
+        {
+          mojom = "autofill.mojom.FormFieldData"
+          cpp = "::autofill::FormFieldData"
+        },
+        {
+          mojom = "autofill.mojom.FormFieldDataPredictions"
+          cpp = "::autofill::FormFieldDataPredictions"
+        },
+        {
+          mojom = "autofill.mojom.FormsPredictionsMap"
+          cpp = "::autofill::FormsPredictionsMap"
+        },
+        {
+          mojom = "autofill.mojom.FormRendererId"
+          cpp = "::autofill::FormRendererId"
+          copyable_pass_by_value = true
+        },
+        {
+          mojom = "autofill.mojom.FieldRendererId"
+          cpp = "::autofill::FieldRendererId"
+          copyable_pass_by_value = true
+        },
+        {
+          mojom = "autofill.mojom.ParsingResult"
+          cpp = "::autofill::ParsingResult"
+        },
+        {
+          mojom = "autofill.mojom.PasswordAndMetadata"
+          cpp = "::autofill::PasswordAndMetadata"
+        },
+        {
+          mojom = "autofill.mojom.PasswordForm"
+          cpp = "::autofill::PasswordForm"
+        },
+        {
+          mojom = "autofill.mojom.PasswordFormFieldPredictionMap"
+          cpp = "::autofill::PasswordFormFieldPredictionMap"
+        },
+        {
+          mojom = "autofill.mojom.PasswordFormFillData"
+          cpp = "::autofill::PasswordFormFillData"
+        },
+        {
+          mojom = "autofill.mojom.PasswordFormGenerationData"
+          cpp = "::autofill::PasswordFormGenerationData"
+        },
+        {
+          mojom = "autofill.mojom.PasswordGenerationUIData"
+          cpp = "::autofill::password_generation::PasswordGenerationUIData"
+        },
+        {
+          mojom = "autofill.mojom.ValueElementPair"
+          cpp = "::autofill::ValueElementPair"
+        },
+      ]
+      traits_headers = [ "autofill_types_mojom_traits.h" ]
+      traits_sources = [ "autofill_types_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//base:i18n",
+        "//components/autofill/core/common",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+  ]
 }
 
 mojom("mojo_test_types") {

diff --git a/components/autofill/core/common/mojom/OWNERS b/components/autofill/core/common/mojom/OWNERS
@@ -2,5 +2,3 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/components/autofill/core/common/mojom/autofill_types.typemap b/components/autofill/core/common/mojom/autofill_types.typemap
diff --git a/components/autofill/core/common/mojom/autofill_types_mojom_traits.h b/components/autofill/core/common/mojom/autofill_types_mojom_traits.h
@@ -16,7 +16,7 @@
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/form_field_data_predictions.h"
-#include "components/autofill/core/common/mojom/autofill_types.mojom.h"
+#include "components/autofill/core/common/mojom/autofill_types.mojom-shared.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/autofill/core/common/password_form_generation_data.h"

diff --git a/components/content_capture/common/BUILD.gn b/components/content_capture/common/BUILD.gn
@@ -35,6 +35,24 @@ mojom("mojo_types") {
     "//mojo/public/mojom/base",
     "//ui/gfx/geometry/mojom",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "content_capture.mojom.ContentCaptureData"
+          cpp = "::content_capture::ContentCaptureData"
+        },
+      ]
+      traits_headers = [ "content_capture_mojom_traits.h" ]
+      traits_sources = [ "content_capture_mojom_traits.cc" ]
+      traits_public_deps = [
+        ":common",
+        "//base",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+  ]
 }
 
 mojom("mojo_test_types") {

diff --git a/components/content_capture/common/OWNERS b/components/content_capture/common/OWNERS
@@ -2,5 +2,3 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/components/content_capture/common/content_capture.typemap b/components/content_capture/common/content_capture.typemap
diff --git a/components/content_capture/common/content_capture_mojom_traits.h b/components/content_capture/common/content_capture_mojom_traits.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "components/content_capture/common/content_capture_data.h"
-#include "components/content_capture/common/content_capture_data.mojom.h"
+#include "components/content_capture/common/content_capture_data.mojom-shared.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "ui/gfx/geometry/rect_f.h"
 

diff --git a/components/content_settings/core/common/BUILD.gn b/components/content_settings/core/common/BUILD.gn
@@ -65,6 +65,41 @@ mojom("mojo_bindings") {
   sources = [ "content_settings.mojom" ]
 
   public_deps = [ "//mojo/public/mojom/base" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "content_settings.mojom.PatternParts"
+          cpp = "::ContentSettingsPattern::PatternParts"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSettingsPattern"
+          cpp = "::ContentSettingsPattern"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSettingsType"
+          cpp = "::ContentSettingsType"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSetting"
+          cpp = "::ContentSetting"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSettingPatternSource"
+          cpp = "::ContentSettingPatternSource"
+        },
+        {
+          mojom = "content_settings.mojom.RendererContentSettingRules"
+          cpp = "::RendererContentSettingRules"
+        },
+      ]
+      traits_headers = [ "content_settings_mojom_traits.h" ]
+      traits_private_headers = [ "content_settings_param_traits.h" ]
+      traits_sources = [ "content_settings_mojom_traits.cc" ]
+      traits_public_deps = [ ":common" ]
+    },
+  ]
 }
 
 component("features") {

diff --git a/components/content_settings/core/common/OWNERS b/components/content_settings/core/common/OWNERS
@@ -4,8 +4,5 @@ per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
-
 per-file *_param_traits*.*=set noparent
 per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS
diff --git a/components/content_settings/core/common/content_settings.typemap b/components/content_settings/core/common/content_settings.typemap
diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h
@@ -9,7 +9,8 @@
 
 #include "base/values.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/content_settings.mojom.h"
+#include "components/content_settings/core/common/content_settings.mojom-shared.h"
+#include "mojo/public/cpp/base/time_mojom_traits.h"
 #include "mojo/public/cpp/base/values_mojom_traits.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"

diff --git a/components/nacl/common/BUILD.gn b/components/nacl/common/BUILD.gn
@@ -107,6 +107,25 @@ if (enable_nacl) {
 
   mojom("mojo_bindings") {
     sources = [ "nacl.mojom" ]
+    cpp_typemaps = [
+      {
+        types = [
+          {
+            mojom = "nacl.mojom.NaClErrorCode"
+            cpp = "::NaClErrorCode"
+          },
+        ]
+        traits_headers =
+            [ "//native_client/src/trusted/service_runtime/nacl_error_code.h" ]
+        traits_private_headers =
+            [ "//components/nacl/common/nacl_types_param_traits.h" ]
+        traits_public_deps = [
+          ":minimal",
+          ":nacl_error_code",
+        ]
+        traits_deps = [ "//ipc" ]
+      },
+    ]
   }
 }
 

diff --git a/components/nacl/common/nacl.typemap b/components/nacl/common/nacl.typemap
diff --git a/components/password_manager/content/common/OWNERS b/components/password_manager/content/common/OWNERS
@@ -1,4 +1,2 @@
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS