chromium/src
0
Fork 0
Code Activity

Remove miscellaneous typemap files

Browse Source 
This merges some typemap configs in //chrome and //chromecast into their
respective mojom target definitions.

Bug: 1059389
Change-Id: I955e624f046b77e0506f661b05716ca53c8108e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2407927
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807238}
This commit is contained in:
Ken Rockot
2020-09-15 23:21:21 +00:00
committed by Commit Bot
parent 5a8dc994d7
commit c87bd72e39
15 changed files with 111 additions and 125 deletions

52
chrome/common/importer/BUILD.gn

@ -12,6 +12,58 @@ mojom("interfaces") {
"//mojo/public/mojom/base",
"//url/mojom:url_mojom_gurl",
]
cpp_typemaps = [
{
types = [
{
mojom = "chrome.mojom.FaviconUsageDataList"
cpp = "::favicon_base::FaviconUsageDataList"
},
{
mojom = "chrome.mojom.ImportedBookmarkEntry"
cpp = "::ImportedBookmarkEntry"
},
{
mojom = "chrome.mojom.ImporterAutofillFormDataEntry"
cpp = "::ImporterAutofillFormDataEntry"
},
{
mojom = "chrome.mojom.ImporterIE7PasswordInfo"
cpp = "::importer::ImporterIE7PasswordInfo"
},
{
mojom = "chrome.mojom.ImporterURLRow"
cpp = "::ImporterURLRow"
},
{
mojom = "chrome.mojom.SearchEngineInfo"
cpp = "::importer::SearchEngineInfo"
},
{
mojom = "chrome.mojom.SourceProfile"
cpp = "::importer::SourceProfile"
},
{
mojom = "chrome.mojom.ImportItem"
cpp = "::importer::ImportItem"
},
]
traits_headers = [
"//chrome/common/importer/imported_bookmark_entry.h",
"//chrome/common/importer/importer_autofill_form_data_entry.h",
"//chrome/common/importer/importer_data_types.h",
"//chrome/common/importer/importer_url_row.h",
"//components/favicon_base/favicon_usage_data.h",
]
traits_private_headers = [ "profile_import_process_param_traits.h" ]
traits_public_deps = [
"//chrome/common",
"//components/favicon_base",
"//ipc",
]
},
]
}
source_set("importer") {

3
chrome/common/importer/OWNERS

@ -10,7 +10,4 @@ per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS
# COMPONENT: UI>Browser>Import

29
chrome/common/importer/profile_import.typemap

@ -1,29 +0,0 @@
# Copyright 2016 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.
mojom = "//chrome/common/importer/profile_import.mojom"
public_headers = [
"//chrome/common/importer/imported_bookmark_entry.h",
"//chrome/common/importer/importer_autofill_form_data_entry.h",
"//chrome/common/importer/importer_data_types.h",
"//chrome/common/importer/importer_url_row.h",
"//components/favicon_base/favicon_usage_data.h",
]
traits_headers =
[ "//chrome/common/importer/profile_import_process_param_traits.h" ]
public_deps = [
"//chrome/common",
"//components/favicon_base",
"//ipc",
]
type_mappings = [
"chrome.mojom.FaviconUsageDataList=::favicon_base::FaviconUsageDataList",
"chrome.mojom.ImportedBookmarkEntry=::ImportedBookmarkEntry",
"chrome.mojom.ImporterAutofillFormDataEntry=::ImporterAutofillFormDataEntry",
"chrome.mojom.ImporterIE7PasswordInfo=::importer::ImporterIE7PasswordInfo",
"chrome.mojom.ImporterURLRow=::ImporterURLRow",
"chrome.mojom.SearchEngineInfo=::importer::SearchEngineInfo",
"chrome.mojom.SourceProfile=::importer::SourceProfile",
"chrome.mojom.ImportItem=::importer::ImportItem",
]

5
chrome/common/importer/typemaps.gni

@ -1,5 +0,0 @@
# Copyright 2016 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.
typemaps = [ "//chrome/common/importer/profile_import.typemap" ]

23
chromecast/common/mojom/BUILD.gn

@ -23,4 +23,27 @@ mojom("mojom") {
"//mojo/public/mojom/base",
"//url/mojom:url_mojom_gurl",
]
cpp_typemaps = [
{
types = [
{
mojom = "chromecast.shell.mojom.BitstreamAudioCodecsInfo"
cpp = "::chromecast::BitstreamAudioCodecsInfo"
},
]
traits_headers = [ "application_media_capabilities_traits.h" ]
traits_public_deps = [ "//chromecast/base" ]
},
{
types = [
{
mojom = "chromecast.mojom.AudioChannel"
cpp = "::chromecast::media::AudioChannel"
},
]
traits_headers = [ "multiroom_mojom_traits.h" ]
traits_public_deps = [ "//chromecast/public/media" ]
},
]
}

2
chromecast/common/mojom/OWNERS

@ -1,6 +1,4 @@
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS
per-file *_mojom_traits*.*=set noparent
per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS

20
chromecast/common/mojom/application_media_capabilities.typemap

@ -1,20 +0,0 @@
# Copyright 2019 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.
mojom = "//chromecast/common/mojom/application_media_capabilities.mojom"
public_headers = [ "//chromecast/base/bitstream_audio_codecs.h" ]
traits_headers =
[ "//chromecast/common/mojom/application_media_capabilities_traits.h" ]
sources = [
"//chromecast/common/mojom/application_media_capabilities_traits.h",
]
public_deps = [
"//chromecast/base",
]
type_mappings = [ "chromecast.shell.mojom.BitstreamAudioCodecsInfo=::chromecast::BitstreamAudioCodecsInfo" ]

1
chromecast/common/mojom/application_media_capabilities_traits.h

@ -6,6 +6,7 @@
#define CHROMECAST_COMMON_MOJOM_APPLICATION_MEDIA_CAPABILITIES_TRAITS_H_
#include "chromecast/base/bitstream_audio_codecs.h"
#include "chromecast/common/mojom/application_media_capabilities.mojom-shared.h"
#include "mojo/public/cpp/bindings/struct_traits.h"
namespace mojo {

20
chromecast/common/mojom/multiroom.typemap

@ -1,20 +0,0 @@
# Copyright 2018 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.
mojom = "//chromecast/common/mojom/multiroom.mojom"
public_headers = [ "//chromecast/public/media/media_pipeline_device_params.h" ]
traits_headers = [ "//chromecast/common/mojom/multiroom_mojom_traits.h" ]
sources = [
"//chromecast/common/mojom/multiroom_mojom_traits.h",
]
public_deps = [
"//chromecast/public/media",
]
type_mappings =
[ "chromecast.mojom.AudioChannel=::chromecast::media::AudioChannel" ]

2
chromecast/common/mojom/multiroom_mojom_traits.h

@ -7,7 +7,7 @@
#include "base/check.h"
#include "base/notreached.h"
#include "chromecast/common/mojom/multiroom.mojom.h"
#include "chromecast/common/mojom/multiroom.mojom-shared.h"
#include "chromecast/public/media/media_pipeline_device_params.h"
#include "mojo/public/cpp/bindings/enum_traits.h"

33
chromecast/media/mojom/BUILD.gn

@ -4,4 +4,37 @@ import("//mojo/public/tools/bindings/mojom.gni")
mojom("mojom") {
sources = [ "media_types.mojom" ]
cpp_typemaps = [
{
types = [
{
mojom = "chromecast.media.mojom.AudioCodec"
cpp = "::chromecast::media::AudioCodec"
},
{
mojom = "chromecast.media.mojom.ChannelLayout"
cpp = "::chromecast::media::ChannelLayout"
},
{
mojom = "chromecast.media.mojom.SampleFormat"
cpp = "::chromecast::media::SampleFormat"
},
{
mojom = "chromecast.media.mojom.StreamId"
cpp = "::chromecast::media::StreamId"
},
{
mojom = "chromecast.media.mojom.EncryptionScheme"
cpp = "::chromecast::media::EncryptionScheme"
},
{
mojom = "chromecast.media.mojom.AudioConfig"
cpp = "::chromecast::media::AudioConfig"
},
]
traits_headers = [ "decoder_config_mojom_traits.h" ]
traits_sources = [ "decoder_config_mojom_traits.cc" ]
traits_public_deps = [ "//chromecast/public/media" ]
},
]
}

26
chromecast/media/mojom/decoder_config.typemap

@ -1,26 +0,0 @@
# Copyright 2020 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.
mojom = "//chromecast/media/mojom/media_types.mojom"
public_headers = [ "//chromecast/public/media/decoder_config.h" ]
traits_headers = [ "//chromecast/media/mojom/decoder_config_mojom_traits.h" ]
sources = [ "//chromecast/media/mojom/decoder_config_mojom_traits.cc" ]
public_deps = [
"//base",
"//chromecast/public/media",
]
# See media_types.typemap for enum mappings.
type_mappings = [
"chromecast.media.mojom.AudioCodec=::chromecast::media::AudioCodec",
"chromecast.media.mojom.ChannelLayout=::chromecast::media::ChannelLayout",
"chromecast.media.mojom.SampleFormat=::chromecast::media::SampleFormat",
"chromecast.media.mojom.StreamId=::chromecast::media::StreamId",
"chromecast.media.mojom.EncryptionScheme=::chromecast::media::EncryptionScheme",
"chromecast.media.mojom.AudioConfig=::chromecast::media::AudioConfig",
]

2
chromecast/media/mojom/decoder_config_mojom_traits.h

@ -5,7 +5,7 @@
#ifndef CHROMECAST_MEDIA_MOJOM_DECODER_CONFIG_MOJOM_TRAITS_H_
#define CHROMECAST_MEDIA_MOJOM_DECODER_CONFIG_MOJOM_TRAITS_H_
#include "chromecast/media/mojom/media_types.mojom.h"
#include "chromecast/media/mojom/media_types.mojom-shared.h"
#include "chromecast/public/media/decoder_config.h"
namespace mojo {

16
chromecast/typemaps.gni

@ -1,16 +0,0 @@
# Copyright 2019 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/chromecast_build.gni")
typemaps = [
"//chromecast/common/mojom/application_media_capabilities.typemap",
"//chromecast/common/mojom/multiroom.typemap",
"//chromecast/media/mojom/decoder_config.typemap",
]
if (chromecast_branding != "public") {
_typemap_internal = read_file("//chromecast/internal/typemaps.gni", "scope")
typemaps += _typemap_internal.typemaps
}

2
mojo/public/tools/bindings/chromium_bindings_configuration.gni

@ -3,9 +3,7 @@
# found in the LICENSE file.
_typemap_imports = [
"//chrome/common/importer/typemaps.gni",
"//chrome/typemaps.gni",
"//chromecast/typemaps.gni",
"//content/browser/typemaps.gni",
"//content/public/common/typemaps.gni",
]