Skip to content

GitLab

T
tangled
Commit 583d4851 authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot
Browse files
Options

Change mojo manifest interface syntax from foo::mojom::Bar to foo.mojom.Bar. 

This updates the bindings generators and hard-coded interface names in
tests and the service_manager.

The remainder of the CL was generated by:

for f in $(find . -name '*.json' -not \( -path './out/*' -o -path './third_party/*' -o -path '*.xcassets/*' \)); do
  grep interface_provider_spec "./$f" >/dev/null && gsed -i s/::/./g "$f";
done

Tbr: jam@chromium.org
Bug: 835446
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_mojo;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I0bb22615b9c66824c6f95da66e3d7016809d63c7
Reviewed-on: https://chromium-review.googlesource.com/1026419
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558841}
parent 87f64561
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 555 additions and 555 deletions
android_webview/browser/aw_browser_manifest_overlay.json
View file @ 583d4851
......@@ -4,11 +4,11 @@
"service_manager:connector": {
"provides": {
"renderer": [
"safe_browsing::mojom::SafeBrowsing",
"spellcheck::mojom::SpellCheckHost"
"safe_browsing.mojom.SafeBrowsing",
"spellcheck.mojom.SpellCheckHost"
],
"profiling_client": [
"heap_profiling::mojom::ProfilingClient"
"heap_profiling.mojom.ProfilingClient"
]
},
"requires": {
......@@ -19,10 +19,10 @@
"navigation:frame": {
"provides": {
"renderer": [
"autofill::mojom::AutofillDriver",
"autofill::mojom::PasswordManagerDriver",
"blink::mojom::TextSuggestionHost",
"web_restrictions::mojom::WebRestrictions"
"autofill.mojom.AutofillDriver",
"autofill.mojom.PasswordManagerDriver",
"blink.mojom.TextSuggestionHost",
"web_restrictions.mojom.WebRestrictions"
]
}
}
......
android_webview/browser/aw_renderer_manifest_overlay.json
View file @ 583d4851
......@@ -4,12 +4,12 @@
"navigation:frame": {
"provides": {
"browser": [
"autofill::mojom::AutofillAgent",
"autofill::mojom::PasswordAutofillAgent",
"autofill::mojom::PasswordGenerationAgent",
"autofill.mojom.AutofillAgent",
"autofill.mojom.PasswordAutofillAgent",
"autofill.mojom.PasswordGenerationAgent",
// TODO(crbug.com/811567): Remove this once AwSafeBrowsingBlockingPage
// no longer sends a GetThreatDOMDetails IPC.
"safe_browsing::mojom::ThreatReporter"
"safe_browsing.mojom.ThreatReporter"
]
}
}
......
android_webview/browser/aw_utility_manifest_overlay.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"service_manager:connector": {
"provides": {
"browser": [
"heap_profiling::mojom::ProfilingClient"
"heap_profiling.mojom.ProfilingClient"
]
}
}
......
ash/components/autoclick/manifest.json
View file @ 583d4851
......@@ -5,8 +5,8 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"mash:launchable": [ "mash::mojom::Launchable" ],
"chromeos:autoclick": [ "autoclick::mojom::AutoclickController" ]
"mash:launchable": [ "mash.mojom.Launchable" ],
"chromeos:autoclick": [ "autoclick.mojom.AutoclickController" ]
},
"requires": {
"*": [ "app" ],
......
ash/components/quick_launch/manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"sandbox_type": "none",
"interface_provider_specs": {
"service_manager:connector": {
"provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
"provides": { "mash:launchable": [ "mash.mojom.Launchable" ] },
"requires": {
"*": [ "app", "mash:launchable" ],
"catalog": [
......
ash/components/touch_hud/manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"sandbox_type": "none",
"interface_provider_specs": {
"service_manager:connector": {
"provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
"provides": { "mash:launchable": [ "mash.mojom.Launchable" ] },
"requires": {
"*": [ "app" ],
"service_manager": [ "service_manager:service_manager" ]
......
ash/manifest.json
View file @ 583d4851
......@@ -8,51 +8,51 @@
// Modifications here should correspond with changes to
// chrome_content_browser_manifest_overlay.json.
"system_ui": [
"app_list::mojom::AppList",
"ash::mojom::AcceleratorController",
"ash::mojom::AccessibilityController",
"ash::mojom::AccessibilityFocusRingController",
"ash::mojom::AppListController",
"ash::mojom::AshMessageCenterController",
"ash::mojom::AssistantController",
"ash::mojom::CastConfig",
"ash::mojom::CrosDisplayConfigController",
"ash::mojom::DockedMagnifierController",
"ash::mojom::EventRewriterController",
"ash::mojom::FirstRunHelper",
"ash::mojom::HighlighterController",
"ash::mojom::ImeController",
"ash::mojom::LocaleNotificationController",
"ash::mojom::LoginScreen",
"ash::mojom::MediaController",
"ash::mojom::NewWindowController",
"ash::mojom::NightLightController",
"ash::mojom::NoteTakingController",
"ash::mojom::ProcessCreationTimeRecorder",
"ash::mojom::SessionController",
"ash::mojom::ShelfController",
"ash::mojom::ShutdownController",
"ash::mojom::SplitViewController",
"ash::mojom::SystemTray",
"ash::mojom::TabletModeController",
"ash::mojom::TrayAction",
"ash::mojom::VoiceInteractionController",
"ash::mojom::VpnList",
"ash::mojom::WallpaperController"
"app_list.mojom.AppList",
"ash.mojom.AcceleratorController",
"ash.mojom.AccessibilityController",
"ash.mojom.AccessibilityFocusRingController",
"ash.mojom.AppListController",
"ash.mojom.AshMessageCenterController",
"ash.mojom.AssistantController",
"ash.mojom.CastConfig",
"ash.mojom.CrosDisplayConfigController",
"ash.mojom.DockedMagnifierController",
"ash.mojom.EventRewriterController",
"ash.mojom.FirstRunHelper",
"ash.mojom.HighlighterController",
"ash.mojom.ImeController",
"ash.mojom.LocaleNotificationController",
"ash.mojom.LoginScreen",
"ash.mojom.MediaController",
"ash.mojom.NewWindowController",
"ash.mojom.NightLightController",
"ash.mojom.NoteTakingController",
"ash.mojom.ProcessCreationTimeRecorder",
"ash.mojom.SessionController",
"ash.mojom.ShelfController",
"ash.mojom.ShutdownController",
"ash.mojom.SplitViewController",
"ash.mojom.SystemTray",
"ash.mojom.TabletModeController",
"ash.mojom.TrayAction",
"ash.mojom.VoiceInteractionController",
"ash.mojom.VpnList",
"ash.mojom.WallpaperController"
],
// Test-only interfaces.
"test": [
"ash::mojom::ShelfTestApi",
"ash::mojom::ShellTestApi",
"ash::mojom::StatusAreaWidgetTestApi",
"ash::mojom::SystemTrayTestApi",
"ash::mojom::TimeToFirstPresentRecorderTestApi"
"ash.mojom.ShelfTestApi",
"ash.mojom.ShellTestApi",
"ash.mojom.StatusAreaWidgetTestApi",
"ash.mojom.SystemTrayTestApi",
"ash.mojom.TimeToFirstPresentRecorderTestApi"
],
// Only chrome is allowed to use this (required as dbus runs in Chrome).
"display": [
"ash::mojom::AshDisplayController"
"ash.mojom.AshDisplayController"
],
"mus:window_manager": [ "ui::mojom::AcceleratorRegistrar" ]
"mus:window_manager": [ "ui.mojom.AcceleratorRegistrar" ]
},
"requires": {
"*": [ "accessibility", "app" ],
......
chrome/app/chrome_manifest.json
View file @ 583d4851
......@@ -7,15 +7,15 @@
// This is only used in classic ash. In mus InputDeviceController comes
// from mus.
"input_device_controller": [
"ui::mojom::InputDeviceController"
"ui.mojom.InputDeviceController"
],
"mash:launchable": [
"mash::mojom::Launchable"
"mash.mojom.Launchable"
],
"renderer": [
"spellcheck::mojom::SpellCheckHost",
"spellcheck::mojom::SpellCheckPanelHost",
"startup_metric_utils::mojom::StartupMetricHost"
"spellcheck.mojom.SpellCheckHost",
"spellcheck.mojom.SpellCheckPanelHost",
"startup_metric_utils.mojom.StartupMetricHost"
]
},
"requires": {
......
chrome/app/chrome_renderer_manifest.json
View file @ 583d4851
......@@ -5,8 +5,8 @@
"service_manager:connector": {
"provides": {
"browser": [
"safe_browsing::mojom::PhishingModelSetter",
"spellcheck::mojom::SpellChecker"
"safe_browsing.mojom.PhishingModelSetter",
"spellcheck.mojom.SpellChecker"
]
},
"requires": {
......
chrome/browser/chrome_content_browser_manifest_overlay.json
View file @ 583d4851
......@@ -5,23 +5,23 @@
"service_manager:connector": {
"provides": {
"renderer": [
"autofill::mojom::AutofillDriver",
"autofill::mojom::PasswordManagerDriver",
"chrome::mojom::CacheStatsRecorder",
"chrome::mojom::NetBenchmarking",
"extensions::StashService",
"metrics::mojom::CallStackProfileCollector",
"mojom::ModuleEventSink",
"rappor::mojom::RapporRecorder",
"safe_browsing::mojom::SafeBrowsing",
"translate::mojom::ContentTranslateDriver"
"autofill.mojom.AutofillDriver",
"autofill.mojom.PasswordManagerDriver",
"chrome.mojom.CacheStatsRecorder",
"chrome.mojom.NetBenchmarking",
"extensions.StashService",
"metrics.mojom.CallStackProfileCollector",
"mojom.ModuleEventSink",
"rappor.mojom.RapporRecorder",
"safe_browsing.mojom.SafeBrowsing",
"translate.mojom.ContentTranslateDriver"
],
"gpu": [
"metrics::mojom::CallStackProfileCollector"
"metrics.mojom.CallStackProfileCollector"
],
"ime:ime_driver": [],
"profiling_client": [
"heap_profiling::mojom::ProfilingClient"
"heap_profiling.mojom.ProfilingClient"
]
},
"requires": {
......@@ -69,61 +69,61 @@
"navigation:frame": {
"provides": {
"renderer": [
"autofill::mojom::AutofillDriver",
"autofill::mojom::PasswordManagerDriver",
"blink::mojom::BudgetService",
"blink::mojom::InstalledAppProvider",
"blink::mojom::MediaDownloadInProductHelp",
"blink::mojom::ShareService",
"blink::mojom::TextSuggestionHost",
"chrome::mojom::OpenSearchDocumentDescriptionHandler",
"chrome::mojom::PrerenderCanceler",
"contextual_search::mojom::ContextualSearchJsApiService",
"dom_distiller::mojom::DistillabilityService",
"dom_distiller::mojom::DistillerJavaScriptService",
"extensions::KeepAlive",
"extensions::mime_handler::MimeHandlerService",
"extensions::mojom::InlineInstall",
"media_router::mojom::MediaRouter",
"page_load_metrics::mojom::PageLoadMetrics",
"password_manager::mojom::CredentialManager",
"safe_browsing::mojom::PhishingDetectorClient",
"translate::mojom::ContentTranslateDriver",
"autofill.mojom.AutofillDriver",
"autofill.mojom.PasswordManagerDriver",
"blink.mojom.BudgetService",
"blink.mojom.InstalledAppProvider",
"blink.mojom.MediaDownloadInProductHelp",
"blink.mojom.ShareService",
"blink.mojom.TextSuggestionHost",
"chrome.mojom.OpenSearchDocumentDescriptionHandler",
"chrome.mojom.PrerenderCanceler",
"contextual_search.mojom.ContextualSearchJsApiService",
"dom_distiller.mojom.DistillabilityService",
"dom_distiller.mojom.DistillerJavaScriptService",
"extensions.KeepAlive",
"extensions.mime_handler.MimeHandlerService",
"extensions.mojom.InlineInstall",
"media_router.mojom.MediaRouter",
"page_load_metrics.mojom.PageLoadMetrics",
"password_manager.mojom.CredentialManager",
"safe_browsing.mojom.PhishingDetectorClient",
"translate.mojom.ContentTranslateDriver",
// TODO(beng): These should be moved to a separate capability.
"media::mojom::MediaEngagementScoreDetailsProvider",
"mojom::BluetoothInternalsHandler",
"mojom::DiscardsDetailsProvider",
"mojom::InterventionsInternalsPageHandler",
"mojom::OmniboxPageHandler",
"mojom::PluginsPageHandler",
"mojom::ResetPasswordHandler",
"mojom::SiteEngagementDetailsProvider",
"mojom::UsbInternalsPageHandler"
"media.mojom.MediaEngagementScoreDetailsProvider",
"mojom.BluetoothInternalsHandler",
"mojom.DiscardsDetailsProvider",
"mojom.InterventionsInternalsPageHandler",
"mojom.OmniboxPageHandler",
"mojom.PluginsPageHandler",
"mojom.ResetPasswordHandler",
"mojom.SiteEngagementDetailsProvider",
"mojom.UsbInternalsPageHandler"
],
"multidevice_setup" : [
"chromeos::multidevice_setup::mojom::MultiDeviceSetup"
"chromeos.multidevice_setup.mojom.MultiDeviceSetup"
]
}
},
"navigation:dedicated_worker": {
"provides": {
"renderer": [
"blink::mojom::BudgetService"
"blink.mojom.BudgetService"
]
}
},
"navigation:service_worker": {
"provides": {
"renderer": [
"blink::mojom::BudgetService"
"blink.mojom.BudgetService"
]
}
},
"navigation:shared_worker": {
"provides": {
"renderer": [
"blink::mojom::BudgetService"
"blink.mojom.BudgetService"
]
}
}
......
chrome/browser/chrome_content_gpu_manifest_overlay.json
View file @ 583d4851
......@@ -4,13 +4,13 @@
"service_manager:connector": {
"provides": {
"browser": [
"arc::mojom::ProtectedBufferManager",
"arc::mojom::VideoDecodeAccelerator",
"arc::mojom::VideoDecodeClient",
"arc::mojom::VideoEncodeAccelerator",
"arc::mojom::VideoEncodeClient",
"arc::mojom::VideoProtectedBufferAllocator",
"heap_profiling::mojom::ProfilingClient"
"arc.mojom.ProtectedBufferManager",
"arc.mojom.VideoDecodeAccelerator",
"arc.mojom.VideoDecodeClient",
"arc.mojom.VideoEncodeAccelerator",
"arc.mojom.VideoEncodeClient",
"arc.mojom.VideoProtectedBufferAllocator",
"heap_profiling.mojom.ProfilingClient"
]
}
}
......
chrome/browser/chrome_content_renderer_manifest_overlay.json
View file @ 583d4851
......@@ -5,27 +5,27 @@
"service_manager:connector": {
"provides": {
"browser": [
"chrome::mojom::SearchBouncer",
"heap_profiling::mojom::ProfilingClient"
"chrome.mojom.SearchBouncer",
"heap_profiling.mojom.ProfilingClient"
]
}
},
"navigation:frame": {
"provides": {
"browser": [
"autofill::mojom::AutofillAgent",
"autofill::mojom::PasswordAutofillAgent",
"autofill::mojom::PasswordGenerationAgent",
"blink::mojom::document_metadata::CopylessPaste",
"chrome::mojom::ChromeRenderFrame",
"chrome::mojom::ContentSettingsRenderer",
"chrome::mojom::PrerenderDispatcher",
"chrome::mojom::SandboxStatusExtension",
"dom_distiller::mojom::DistillerPageNotifierService",
"extensions::mojom::AppWindow",
"safe_browsing::mojom::ThreatReporter",
"safe_browsing::mojom::PhishingDetector",
"spellcheck::mojom::SpellCheckPanel"
"autofill.mojom.AutofillAgent",
"autofill.mojom.PasswordAutofillAgent",
"autofill.mojom.PasswordGenerationAgent",
"blink.mojom.document_metadata.CopylessPaste",
"chrome.mojom.ChromeRenderFrame",
"chrome.mojom.ContentSettingsRenderer",
"chrome.mojom.PrerenderDispatcher",
"chrome.mojom.SandboxStatusExtension",
"dom_distiller.mojom.DistillerPageNotifierService",
"extensions.mojom.AppWindow",
"safe_browsing.mojom.ThreatReporter",
"safe_browsing.mojom.PhishingDetector",
"spellcheck.mojom.SpellCheckPanel"
]
},
"requires": {
......
chrome/browser/chrome_content_utility_manifest_overlay.json
View file @ 583d4851
......@@ -4,13 +4,13 @@
"service_manager:connector": {
"provides": {
"browser": [
"chrome::mojom::DialDeviceDescriptionParser",
"chrome::mojom::ProfileImport",
"chrome::mojom::ShellHandler",
"payments::mojom::PaymentManifestParser",
"heap_profiling::mojom::ProfilingClient",
"proxy_resolver::mojom::ProxyResolverFactory",
"safe_json::mojom::SafeJsonParser"
"chrome.mojom.DialDeviceDescriptionParser",
"chrome.mojom.ProfileImport",
"chrome.mojom.ShellHandler",
"payments.mojom.PaymentManifestParser",
"heap_profiling.mojom.ProfilingClient",
"proxy_resolver.mojom.ProxyResolverFactory",
"safe_json.mojom.SafeJsonParser"
]
}
}
......
chrome/browser/chromeos/prefs/ash_pref_connector_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"pref_connector": [
"ash::mojom::PrefConnector"
"ash.mojom.PrefConnector"
]
},
"requires": {
......
chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
View file @ 583d4851
......@@ -149,7 +149,7 @@ class TestCloudPrintProxyService : public CloudPrintProxyService {
service_manager::InterfaceProvider::TestApi test_api(
&process_control_.remote_interfaces());
test_api.SetBinderForName(
"cloud_print::mojom::CloudPrint",
"cloud_print.mojom.CloudPrint",
base::Bind(&TestCloudPrintProxyService::HandleCloudPrintProxyRequest,
base::Unretained(this)));
service_manager::mojom::InterfaceProviderPtr handle;
......@@ -160,7 +160,7 @@ class TestCloudPrintProxyService : public CloudPrintProxyService {
~TestCloudPrintProxyService() override {
service_manager::InterfaceProvider::TestApi test_api(
&ServiceProcessControl::GetInstance()->remote_interfaces());
test_api.ClearBinderForName("cloud_print::mojom::CloudPrint");
test_api.ClearBinderForName("cloud_print.mojom.CloudPrint");
}
void Initialize() {
......
chrome/services/file_util/manifest.json
View file @ 583d4851
......@@ -5,8 +5,8 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"analyze_archive": [ "chrome::mojom::SafeArchiveAnalyzer" ],
"zip_file": [ "chrome::mojom::ZipFileCreator" ]
"analyze_archive": [ "chrome.mojom.SafeArchiveAnalyzer" ],
"zip_file": [ "chrome.mojom.ZipFileCreator" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chrome/services/media_gallery_util/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"parse_media": [ "chrome::mojom::MediaParserFactory" ]
"parse_media": [ "chrome.mojom.MediaParserFactory" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chrome/services/printing/manifest.json
View file @ 583d4851
......@@ -6,8 +6,8 @@
"service_manager:connector": {
"provides": {
"converter": [
"printing::mojom::PdfToEmfConverterFactory",
"printing::mojom::PdfToPwgRasterConverter" ]
"printing.mojom.PdfToEmfConverterFactory",
"printing.mojom.PdfToPwgRasterConverter" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chrome/services/removable_storage_writer/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"removable_storage_writer": [ "chrome::mojom::RemovableStorageWriter" ]
"removable_storage_writer": [ "chrome.mojom.RemovableStorageWriter" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chrome/services/util_win/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"shell_util_win": [ "chrome::mojom::ShellUtilWin" ]
"shell_util_win": [ "chrome.mojom.ShellUtilWin" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chrome/services/wifi_util_win/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"wifi_credentials": [ "chrome::mojom::WiFiCredentialsGetter" ]
"wifi_credentials": [ "chrome.mojom.WiFiCredentialsGetter" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chrome/utility/importer/profile_import_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"import": [ "chrome::mojom::ProfileImport" ]
"import": [ "chrome.mojom.ProfileImport" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
chromecast/browser/cast_content_browser_manifest_overlay.json
View file @ 583d4851
......@@ -5,15 +5,15 @@
"service_manager:connector": {
"provides": {
"renderer": [
"chromecast::media::mojom::MediaCaps",
"chromecast::mojom::MemoryPressureController"
"chromecast.media.mojom.MediaCaps",
"chromecast.mojom.MemoryPressureController"
]
}
},
"navigation:frame": {
"provides": {
"renderer": [
"chromecast::shell::mojom::ApplicationMediaCapabilities"
"chromecast.shell.mojom.ApplicationMediaCapabilities"
]
}
}
......
chromeos/services/assistant/manifest.json
View file @ 583d4851
......@@ -9,9 +9,9 @@
},
"provides": {
"assistant": [
"chromeos::assistant::mojom::Assistant",
"chromeos::assistant::mojom::AssistantPlatform",
"chromeos::assistant::mojom::AssistantSettingsManager"
"chromeos.assistant.mojom.Assistant",
"chromeos.assistant.mojom.AssistantPlatform",
"chromeos.assistant.mojom.AssistantSettingsManager"
]
}
}
......
chromeos/services/assistant/unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
chromeos/services/device_sync/manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"device_sync": [ "device_sync::mojom::DeviceSync" ]
"device_sync": [ "device_sync.mojom.DeviceSync" ]
}
}
}
......
chromeos/services/multidevice_setup/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"multidevice_setup" : [
"chromeos::multidevice_setup::mojom::MultiDeviceSetup"
"chromeos.multidevice_setup.mojom.MultiDeviceSetup"
]
}
}
......
components/nacl/broker/nacl_broker_manifest.json
View file @ 583d4851
......@@ -5,15 +5,15 @@
"service_manager:connector": {
"provides": {
"browser": [
"IPC::mojom::ChannelBootstrap",
"IPC.mojom.ChannelBootstrap",
// NOTE: The interfaces below are not implemented in the nacl_loader
// service, but they are requested from all child processes by common
// browser-side code. We list them here to make the Service Manager
// happy.
"content::mojom::Child",
"content::mojom::ChildControl",
"content::mojom::ChildHistogramFetcherFactory"
"content.mojom.Child",
"content.mojom.ChildControl",
"content.mojom.ChildHistogramFetcherFactory"
]
}
}
......
components/nacl/loader/nacl_loader_manifest.json
View file @ 583d4851
......@@ -5,11 +5,11 @@
"service_manager:connector": {
"provides": {
"browser": [
"IPC::mojom::ChannelBootstrap",
"content::mojom::Child",
"content::mojom::ChildControl",
"content::mojom::ChildHistogramFetcherFactory",
"content::mojom::ResourceUsageReporter"
"IPC.mojom.ChannelBootstrap",
"content.mojom.Child",
"content.mojom.ChildControl",
"content.mojom.ChildHistogramFetcherFactory",
"content.mojom.ResourceUsageReporter"
]
}
}
......
components/printing/service/pdf_compositor_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"compositor": [ "printing::mojom::PdfCompositor" ]
"compositor": [ "printing.mojom.PdfCompositor" ]
},
"requires": {
"*": [ "app" ],
......
components/printing/service/pdf_compositor_service_unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
components/services/filesystem/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"filesystem:filesystem": [ "filesystem::mojom::FileSystem" ]
"filesystem:filesystem": [ "filesystem.mojom.FileSystem" ]
},
"requires": {
"*": [ "app" ]
......
components/services/font/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"app": [ "font_service::mojom::FontService" ]
"app": [ "font_service.mojom.FontService" ]
},
"requires": {
"*": [ "app" ]
......
components/services/heap_profiling/heap_profiling_manifest.json
View file @ 583d4851
......@@ -5,8 +5,8 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"profiling": [ "heap_profiling::mojom::ProfilingService" ],
"heap_profiler": [ "memory_instrumentation::mojom::HeapProfiler" ]
"profiling": [ "heap_profiling.mojom.ProfilingService" ],
"heap_profiler": [ "memory_instrumentation.mojom.HeapProfiler" ]
},
"requires": {
"*": [ "app" ],
......
components/services/leveldb/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"leveldb:leveldb": [ "leveldb::mojom::LevelDBService" ]
"leveldb:leveldb": [ "leveldb.mojom.LevelDBService" ]
},
"requires": {
"*": [ "app" ]
......
components/services/patch/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"patch_file": [ "patch::mojom::FilePatcher" ]
"patch_file": [ "patch.mojom.FilePatcher" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
components/services/unzip/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"unzip_file": [ "unzip::mojom::Unzipper" ]
"unzip_file": [ "unzip.mojom.Unzipper" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
content/browser/frame_host/render_frame_host_impl_browsertest.cc
View file @ 583d4851
......@@ -1242,8 +1242,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
const GURL kUrl3(embedded_test_server()->GetURL("/title3.html"));
const GURL kUrl4(embedded_test_server()->GetURL("/empty.html"));
// The 31-bit hash of the string "content::mojom::BrowserTarget".
const int32_t kHashOfContentMojomBrowserTarget = 0x1CA01D37;
// The 31-bit hash of the string "content.mojom:BrowserTarget".
const int32_t kHashOfContentMojomBrowserTarget = 0x1730feb8;
// Client ends of the fake interface provider requests injected for the first
// and second navigations.
......@@ -1275,9 +1275,9 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
// Simulate two interface requests corresponding to the first navigation
// arrived after the second navigation was committed, hence were dropped.
interface_provider_1->GetInterface("content::mojom::BrowserTarget",
interface_provider_1->GetInterface("content.mojom.BrowserTarget",
CreateDisconnectedMessagePipeHandle());
interface_provider_1->GetInterface("content::mojom::BrowserTarget",
interface_provider_1->GetInterface("content.mojom.BrowserTarget",
CreateDisconnectedMessagePipeHandle());
// RFHI destroys the DroppedInterfaceRequestLogger from navigation `n` on
......@@ -1295,7 +1295,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
}
// Simulate one interface request dropped for the second URL.
interface_provider_2->GetInterface("content::mojom::BrowserTarget",
interface_provider_2->GetInterface("content.mojom.BrowserTarget",
CreateDisconnectedMessagePipeHandle());
// A final navigation should record the sample from the second URL.
......@@ -1311,9 +1311,9 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
// Both the DroppedInterfaceRequestLogger for the first and second URLs are
// destroyed -- even more interfacerequests should not cause any crashes.
interface_provider_1->GetInterface("content::mojom::BrowserTarget",
interface_provider_1->GetInterface("content.mojom.BrowserTarget",
CreateDisconnectedMessagePipeHandle());
interface_provider_2->GetInterface("content::mojom::BrowserTarget",
interface_provider_2->GetInterface("content.mojom.BrowserTarget",
CreateDisconnectedMessagePipeHandle());
// The interface connections should be broken.
......
content/public/app/mojo/content_gpu_manifest.json
View file @ 583d4851
......@@ -5,20 +5,20 @@
"service_manager:connector": {
"provides": {
"browser": [
"content::mojom::Child",
"content::mojom::ChildControl",
"content::mojom::ChildHistogramFetcher",
"content::mojom::ChildHistogramFetcherFactory",
"content::mojom::ResourceUsageReporter",
"IPC::mojom::ChannelBootstrap",
"service_manager::mojom::ServiceFactory",
"ui::ozone::mojom::DeviceCursor",
"ui::ozone::mojom::DrmDevice",
"viz::mojom::CompositingModeReporter",
"viz::mojom::VizMain"
"content.mojom.Child",
"content.mojom.ChildControl",
"content.mojom.ChildHistogramFetcher",
"content.mojom.ChildHistogramFetcherFactory",
"content.mojom.ResourceUsageReporter",
"IPC.mojom.ChannelBootstrap",
"service_manager.mojom.ServiceFactory",
"ui.ozone.mojom.DeviceCursor",
"ui.ozone.mojom.DrmDevice",
"viz.mojom.CompositingModeReporter",
"viz.mojom.VizMain"
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
content/public/app/mojo/content_packaged_services_manifest.json
View file @ 583d4851
......@@ -12,7 +12,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
content/public/app/mojo/content_plugin_manifest.json
View file @ 583d4851
......@@ -5,15 +5,15 @@
"service_manager:connector": {
"provides": {
"browser": [
"content::mojom::Child",
"content::mojom::ChildControl",
"content::mojom::ChildHistogramFetcher",
"content::mojom::ChildHistogramFetcherFactory",
"content::mojom::ResourceUsageReporter",
"IPC::mojom::ChannelBootstrap"
"content.mojom.Child",
"content.mojom.ChildControl",
"content.mojom.ChildHistogramFetcher",
"content.mojom.ChildHistogramFetcherFactory",
"content.mojom.ResourceUsageReporter",
"IPC.mojom.ChannelBootstrap"
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
content/public/app/mojo/content_renderer_manifest.json
View file @ 583d4851
......@@ -5,24 +5,24 @@
"service_manager:connector": {
"provides": {
"browser": [
"blink::mojom::LeakDetector",
"blink::mojom::OomIntervention",
"blink::mojom::WebDatabase",
"content::mojom::AppCacheFrontend",
"content::mojom::Child",
"content::mojom::ChildControl",
"content::mojom::ChildHistogramFetcher",
"content::mojom::ChildHistogramFetcherFactory",
"content::mojom::FrameFactory",
"content::mojom::RenderWidgetWindowTreeClientFactory",
"content::mojom::ResourceUsageReporter",
"content::mojom::SharedWorkerFactory",
"IPC::mojom::ChannelBootstrap",
"visitedlink::mojom::VisitedLinkNotificationSink",
"web_cache::mojom::WebCache"
"blink.mojom.LeakDetector",
"blink.mojom.OomIntervention",
"blink.mojom.WebDatabase",
"content.mojom.AppCacheFrontend",
"content.mojom.Child",
"content.mojom.ChildControl",
"content.mojom.ChildHistogramFetcher",
"content.mojom.ChildHistogramFetcherFactory",
"content.mojom.FrameFactory",
"content.mojom.RenderWidgetWindowTreeClientFactory",
"content.mojom.ResourceUsageReporter",
"content.mojom.SharedWorkerFactory",
"IPC.mojom.ChannelBootstrap",
"visitedlink.mojom.VisitedLinkNotificationSink",
"web_cache.mojom.WebCache"
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......@@ -48,18 +48,18 @@
"navigation:frame": {
"provides": {
"browser": [
"blink::mojom::AppBannerController",
"blink::mojom::EngagementClient",
"blink::mojom::InstallationService",
"blink::mojom::ManifestManager",
"blink::mojom::MediaDevicesListener",
"blink::mojom::TextSuggestionBackend",
"content::mojom::ImageDownloader",
"content::mojom::FrameInputHandler",
"content::mojom::FullscreenVideoElementHandler",
"content::mojom::MediaStreamDeviceObserver",
"content::mojom::Widget",
"viz::mojom::InputTargetClient"
"blink.mojom.AppBannerController",
"blink.mojom.EngagementClient",
"blink.mojom.InstallationService",
"blink.mojom.ManifestManager",
"blink.mojom.MediaDevicesListener",
"blink.mojom.TextSuggestionBackend",
"content.mojom.ImageDownloader",
"content.mojom.FrameInputHandler",
"content.mojom.FullscreenVideoElementHandler",
"content.mojom.MediaStreamDeviceObserver",
"content.mojom.Widget",
"viz.mojom.InputTargetClient"
]
},
"requires": {
......
content/public/app/mojo/content_utility_manifest.json
View file @ 583d4851
......@@ -5,18 +5,18 @@
"service_manager:connector": {
"provides": {
"browser": [
"content::mojom::Child",
"content::mojom::ChildControl",
"content::mojom::ChildHistogramFetcher",
"content::mojom::ChildHistogramFetcherFactory",
"content::mojom::ResourceUsageReporter",
"IPC::mojom::ChannelBootstrap",
"printing::mojom::PdfToEmfConverterFactory",
"printing::mojom::PdfToPwgRasterConverter",
"service_manager::mojom::ServiceFactory"
"content.mojom.Child",
"content.mojom.ChildControl",
"content.mojom.ChildHistogramFetcher",
"content.mojom.ChildHistogramFetcherFactory",
"content.mojom.ResourceUsageReporter",
"IPC.mojom.ChannelBootstrap",
"printing.mojom.PdfToEmfConverterFactory",
"printing.mojom.PdfToPwgRasterConverter",
"service_manager.mojom.ServiceFactory"
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
content/shell/browser/content_shell_browser_manifest_overlay.json
View file @ 583d4851
......@@ -4,11 +4,11 @@
"service_manager:connector": {
"provides": {
"renderer": [
"content::mojom::LayoutTestBluetoothFakeAdapterSetter",
"content::mojom::MojoLayoutTestHelper",
"content::mojom::FakeBluetoothChooser",
"bluetooth::mojom::FakeBluetooth",
"blink::test::mojom::WebPackageInternals"
"content.mojom.LayoutTestBluetoothFakeAdapterSetter",
"content.mojom.MojoLayoutTestHelper",
"content.mojom.FakeBluetoothChooser",
"bluetooth.mojom.FakeBluetooth",
"blink.test.mojom.WebPackageInternals"
]
},
"requires": {
......@@ -21,7 +21,7 @@
"navigation:frame": {
"provides": {
"renderer": [
"content::mojom::MojoLayoutTestHelper"
"content.mojom.MojoLayoutTestHelper"
]
}
}
......
content/shell/browser/content_shell_gpu_manifest_overlay.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"service_manager:connector": {
"provides": {
"browser": [
"content::mojom::PowerMonitorTest"
"content.mojom.PowerMonitorTest"
]
}
}
......
content/shell/browser/content_shell_renderer_manifest_overlay.json
View file @ 583d4851
......@@ -4,15 +4,15 @@
"service_manager:connector": {
"provides": {
"browser": [
"content::mojom::PowerMonitorTest",
"content::mojom::TestService"
"content.mojom.PowerMonitorTest",
"content.mojom.TestService"
]
}
},
"navigation:frame": {
"provides": {
"browser": [
"content::mojom::LayoutTestControl"
"content.mojom.LayoutTestControl"
]
}
}
......
content/shell/browser/content_shell_utility_manifest_overlay.json
View file @ 583d4851
......@@ -4,8 +4,8 @@
"service_manager:connector": {
"provides": {
"browser": [
"content::mojom::PowerMonitorTest",
"content::mojom::TestService"
"content.mojom.PowerMonitorTest",
"content.mojom.TestService"
]
}
}
......
content/test/unittests_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
headless/lib/renderer/headless_renderer_manifest_overlay.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"navigation:frame": {
"provides": {
"browser": [
"headless::HeadlessRenderFrameController"
"headless.HeadlessRenderFrameController"
]
}
}
......
ios/web/public/app/mojo/web_browser_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
ios/web/public/app/mojo/web_packaged_services_manifest.json
View file @ 583d4851
......@@ -12,7 +12,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
ios/web/webui/mojo_facade_unittest.mm
View file @ 583d4851
......@@ -110,7 +110,7 @@ TEST_F(MojoFacadeTest, BindInterface) {
NSDictionary* connect = @{
@"name" : @"Mojo.bindInterface",
@"args" : @{
@"interfaceName" : @"::TestUIHandlerMojo",
@"interfaceName" : @".TestUIHandlerMojo",
@"requestHandle" : @(handle0),
},
};
......
mash/catalog_viewer/manifest.json
View file @ 583d4851
......@@ -3,7 +3,7 @@
"display_name": "Catalog Viewer",
"interface_provider_specs": {
"service_manager:connector": {
"provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
"provides": { "mash:launchable": [ "mash.mojom.Launchable" ] },
"requires": {
"*": [ "app" ],
"catalog": [ "catalog:catalog" ]
......
mash/example/views_examples/manifest.json
View file @ 583d4851
......@@ -3,7 +3,7 @@
"display_name": "Views Examples",
"interface_provider_specs": {
"service_manager:connector": {
"provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
"provides": { "mash:launchable": [ "mash.mojom.Launchable" ] },
"requires": { "*": [ "app" ] }
}
}
......
mash/example/window_type_launcher/manifest.json
View file @ 583d4851
......@@ -3,7 +3,7 @@
"display_name": "Window Type Launcher",
"interface_provider_specs": {
"service_manager:connector": {
"provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
"provides": { "mash:launchable": [ "mash.mojom.Launchable" ] },
"requires": {
"*": [ "app" ]
}
......
mash/task_viewer/manifest.json
View file @ 583d4851
......@@ -3,7 +3,7 @@
"display_name": "Task Viewer",
"interface_provider_specs": {
"service_manager:connector": {
"provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
"provides": { "mash:launchable": [ "mash.mojom.Launchable" ] },
"requires": {
"*": [ "app" ],
"catalog": [ "catalog:catalog" ],
......
media/mojo/services/cdm_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"media:cdm": [ "media::mojom::CdmService" ]
"media:cdm": [ "media.mojom.CdmService" ]
},
"requires": {
"*": [ "app" ]
......
media/mojo/services/cdm_service_unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
media/mojo/services/media_manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"media:media": [ "media::mojom::MediaService" ]
"media:media": [ "media.mojom.MediaService" ]
},
"requires": {
"*": [ "app" ]
......
mojo/android/javatests/src/org/chromium/mojo/bindings/InterfacesTest.java
View file @ 583d4851
......@@ -229,7 +229,7 @@ public class InterfacesTest {
@Test
@SmallTest
public void testName() {
Assert.assertEquals("sample::NamedObject", NamedObject.MANAGER.getName());
Assert.assertEquals("sample.NamedObject", NamedObject.MANAGER.getName());
}
@Test
......
mojo/public/cpp/bindings/tests/constant_unittest.cc
View file @ 583d4851
......@@ -53,7 +53,7 @@ TEST(ConstantTest, InterfaceConstants) {
EXPECT_EQ(base::StringPiece(InterfaceWithConstants::kStringValue),
"interface test string contents");
EXPECT_EQ(base::StringPiece(InterfaceWithConstants::Name_),
"mojo::test::InterfaceWithConstants");
"mojo.test.InterfaceWithConstants");
}
} // namespace test
......
mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
View file @ 583d4851
......@@ -31,7 +31,7 @@ std::move(p_{{param.name}})
{%- endmacro %}
{#--- Begin #}
const char {{class_name}}::Name_[] = "{{namespace_as_string}}::{{class_name}}";
const char {{class_name}}::Name_[] = "{{namespace}}.{{class_name}}";
{#--- Constants #}
{%- for constant in interface.constants %}
......
mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
View file @ 583d4851
......@@ -60,7 +60,7 @@ public static final {{manager_class(interface, True)}} MANAGER =
@Override
public String getName() {
return "{{namespace|replace(".","::")}}::{{interface.name}}";
return "{{namespace}}.{{interface.name}}";
}
@Override
......
mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
View file @ 583d4851
......@@ -215,7 +215,7 @@ params.{{parameter.name}}{% if not loop.last %}, {% endif -%}
}
var {{interface.name}} = {
name: '{{module.mojom_namespace|replace(".","::")}}::{{interface.mojom_name}}',
name: '{{module.mojom_namespace}}.{{interface.mojom_name}}',
kVersion: {{interface.version}},
ptrClass: {{interface.name}}Ptr,
proxyClass: {{interface.name}}Proxy,
......
services/audio/manifest.json
View file @ 583d4851
......@@ -5,10 +5,10 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"info": [ "audio::mojom::SystemInfo" ],
"debug_recording": [ "audio::mojom::DebugRecording" ],
"stream_factory": [ "audio::mojom::StreamFactory" ],
"device_notifier": [ "audio::mojom::DeviceNotifier" ]
"info": [ "audio.mojom.SystemInfo" ],
"debug_recording": [ "audio.mojom.DebugRecording" ],
"stream_factory": [ "audio.mojom.StreamFactory" ],
"device_notifier": [ "audio.mojom.DeviceNotifier" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
services/audio/test/service_unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
services/catalog/manifest.json
View file @ 583d4851
......@@ -9,8 +9,8 @@
// build time or something. Same with service:service_manager.
"service_manager:connector": {
"provides": {
"directory": [ "filesystem::mojom::Directory" ],
"control": [ "catalog::mojom::CatalogControl" ]
"directory": [ "filesystem.mojom.Directory" ],
"control": [ "catalog.mojom.CatalogControl" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
services/data_decoder/manifest.json
View file @ 583d4851
......@@ -4,9 +4,9 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"image_decoder": [ "data_decoder::mojom::ImageDecoder" ],
"json_parser": [ "data_decoder::mojom::JsonParser" ],
"xml_parser": [ "data_decoder::mojom::XmlParser" ]
"image_decoder": [ "data_decoder.mojom.ImageDecoder" ],
"json_parser": [ "data_decoder.mojom.JsonParser" ],
"xml_parser": [ "data_decoder.mojom.XmlParser" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
services/device/manifest.json
View file @ 583d4851
......@@ -4,26 +4,26 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"device:battery_monitor": [ "device::mojom::BatteryMonitor" ],
"device:fingerprint": [ "device::mojom::Fingerprint" ],
"device:generic_sensor": [ "device::mojom::SensorProvider" ],
"device:geolocation": [ "device::mojom::GeolocationContext" ],
"device:geolocation_config": [ "device::mojom::GeolocationConfig" ],
"device:geolocation_control": [ "device::mojom::GeolocationControl" ],
"device:hid": [ "device::mojom::HidManager" ],
"device:input_service": [ "device::mojom::InputDeviceManager" ],
"device:ip_geolocator": [ "device::mojom::PublicIpAddressGeolocationProvider" ],
"device:mtp": [ "device::mojom::MtpManager" ],
"device:nfc": [ "device::mojom::NFCProvider" ],
"device:power_monitor": [ "device::mojom::PowerMonitor" ],
"device:screen_orientation": [ "device::mojom::ScreenOrientationListener" ],
"device:battery_monitor": [ "device.mojom.BatteryMonitor" ],
"device:fingerprint": [ "device.mojom.Fingerprint" ],
"device:generic_sensor": [ "device.mojom.SensorProvider" ],
"device:geolocation": [ "device.mojom.GeolocationContext" ],
"device:geolocation_config": [ "device.mojom.GeolocationConfig" ],
"device:geolocation_control": [ "device.mojom.GeolocationControl" ],
"device:hid": [ "device.mojom.HidManager" ],
"device:input_service": [ "device.mojom.InputDeviceManager" ],
"device:ip_geolocator": [ "device.mojom.PublicIpAddressGeolocationProvider" ],
"device:mtp": [ "device.mojom.MtpManager" ],
"device:nfc": [ "device.mojom.NFCProvider" ],
"device:power_monitor": [ "device.mojom.PowerMonitor" ],
"device:screen_orientation": [ "device.mojom.ScreenOrientationListener" ],
"device:serial": [
"device::mojom::SerialDeviceEnumerator",
"device::mojom::SerialIoHandler"
"device.mojom.SerialDeviceEnumerator",
"device.mojom.SerialIoHandler"
],
"device:time_zone_monitor": [ "device::mojom::TimeZoneMonitor" ],
"device:vibration": [ "device::mojom::VibrationManager" ],
"device:wake_lock": [ "device::mojom::WakeLockProvider" ]
"device:time_zone_monitor": [ "device.mojom.TimeZoneMonitor" ],
"device:vibration": [ "device.mojom.VibrationManager" ],
"device:wake_lock": [ "device.mojom.WakeLockProvider" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
services/device/unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
services/file/manifest.json
View file @ 583d4851
......@@ -4,8 +4,8 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"file:filesystem": [ "file::mojom::FileSystem" ],
"file:leveldb": [ "leveldb::mojom::LevelDBService" ]
"file:filesystem": [ "file.mojom.FileSystem" ],
"file:leveldb": [ "leveldb.mojom.LevelDBService" ]
},
"requires": {
"*": [ "app" ]
......
services/identity/manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"identity_manager" : [ "identity::mojom::IdentityManager" ]
"identity_manager" : [ "identity.mojom.IdentityManager" ]
}
}
}
......
services/identity/unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
services/metrics/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"url_keyed_metrics": [
"ukm::mojom::UkmRecorderInterface"
"ukm.mojom.UkmRecorderInterface"
]
},
"requires": {
......
services/network/manifest.json
View file @ 583d4851
......@@ -6,13 +6,13 @@
"service_manager:connector": {
"provides": {
"network_service": [
"network::mojom::NetworkService"
"network.mojom.NetworkService"
],
"test": [
"network::mojom::NetworkServiceTest"
"network.mojom.NetworkServiceTest"
],
"url_loader": [
"network::mojom::URLLoaderFactory"
"network.mojom.URLLoaderFactory"
]
},
"requires": {
......
services/network/test/service_unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
services/preferences/local_state_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"pref_client": [
"prefs::mojom::PrefStoreConnector"
"prefs.mojom.PrefStoreConnector"
]
},
"requires": {
......
services/preferences/manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"pref_client": [
"prefs::mojom::PrefStoreConnector"
"prefs.mojom.PrefStoreConnector"
]
},
"requires": {
......
services/preferences/unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
services/proxy_resolver/manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"factory": [ "proxy_resolver::mojom::ProxyResolverFactory" ]
"factory": [ "proxy_resolver.mojom.ProxyResolverFactory" ]
},
"requires": {
"service_manager": [ "service_manager:all_users" ]
......
services/resource_coordinator/manifest.json
View file @ 583d4851
......@@ -5,14 +5,14 @@
"service_manager:connector": {
"provides": {
"app": [
"memory_instrumentation::mojom::Coordinator"
"memory_instrumentation.mojom.Coordinator"
],
"coordination_unit_introspector": [
"resource_coordinator::mojom::CoordinationUnitIntrospector"
"resource_coordinator.mojom.CoordinationUnitIntrospector"
],
"coordination_unit": [ "resource_coordinator::mojom::CoordinationUnitProvider" ],
"heap_profiler_helper": [ "memory_instrumentation::mojom::HeapProfilerHelper" ],
"page_signal": [ "resource_coordinator::mojom::PageSignalGenerator" ],
"coordination_unit": [ "resource_coordinator.mojom.CoordinationUnitProvider" ],
"heap_profiler_helper": [ "memory_instrumentation.mojom.HeapProfilerHelper" ],
"page_signal": [ "resource_coordinator.mojom.PageSignalGenerator" ],
"tests": [ "*" ]
},
"requires": {
......
services/service_manager/background/tests/test_service_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"background_service_manager_unittest:test_service": [
"service_manager::mojom::TestService"
"service_manager.mojom.TestService"
]
}
}
......
services/service_manager/manifest.json
View file @ 583d4851
......@@ -25,7 +25,7 @@
"service_manager:block_wildcard": [ ],
"service_manager:service_manager": [
"service_manager::mojom::ServiceManager"
"service_manager.mojom.ServiceManager"
]
},
"requires": {
......
services/service_manager/service_manager.cc
View file @ 583d4851
......@@ -876,7 +876,7 @@ ServiceManager::ServiceManager(std::unique_ptr<ServiceProcessLauncherFactory>
weak_ptr_factory_(this) {
InterfaceProviderSpec spec;
spec.provides[kCapability_ServiceManager].insert(
"service_manager::mojom::ServiceManager");
"service_manager.mojom.ServiceManager");
spec.requires["*"].insert("service_manager:service_factory");
InterfaceProviderSpecMap specs;
specs[mojom::kServiceManager_ConnectorSpec] = std::move(spec);
......@@ -1107,9 +1107,9 @@ void ServiceManager::InitCatalog(mojom::ServicePtr catalog) {
// TODO(beng): It'd be great to build this from the manifest, however there's
// a bit of a chicken-and-egg problem.
InterfaceProviderSpec spec;
spec.provides["directory"].insert("filesystem::mojom::Directory");
spec.provides["catalog:catalog"].insert("catalog::mojom::Catalog");
spec.provides["control"].insert("catalog::mojom::CatalogControl");
spec.provides["directory"].insert("filesystem.mojom.Directory");
spec.provides["catalog:catalog"].insert("catalog.mojom.Catalog");
spec.provides["control"].insert("catalog.mojom.CatalogControl");
InterfaceProviderSpecMap specs;
specs[mojom::kServiceManager_ConnectorSpec] = std::move(spec);
......
services/service_manager/tests/connect/connect_test_app_a_manifest.json
View file @ 583d4851
......@@ -5,12 +5,12 @@
"service_manager:connector": {
"provides": {
"connect_unittests:connect_test_service": [
"service_manager::test::mojom::ConnectTestService"
"service_manager.test.mojom.ConnectTestService"
],
"connect_unittests:standalone_app": [
"service_manager::test::mojom::StandaloneApp"
"service_manager.test.mojom.StandaloneApp"
],
"connect_unittests:user_id_test": [ "service_manager::test::mojom::UserIdTest" ]
"connect_unittests:user_id_test": [ "service_manager.test.mojom.UserIdTest" ]
},
"requires": {
"connect_unittests": [ "connect_unittests:exposed_interface" ],
......
services/service_manager/tests/connect/connect_test_app_manifest.json
View file @ 583d4851
......@@ -5,12 +5,12 @@
"service_manager:connector": {
"provides": {
"connect_unittests:connect_test_service": [
"service_manager::test::mojom::ConnectTestService"
"service_manager.test.mojom.ConnectTestService"
],
"connect_unittests:standalone_app": [
"service_manager::test::mojom::StandaloneApp"
"service_manager.test.mojom.StandaloneApp"
],
"connect_unittests:user_id_test": [ "service_manager::test::mojom::UserIdTest" ]
"connect_unittests:user_id_test": [ "service_manager.test.mojom.UserIdTest" ]
},
"requires": {
"connect_unittests": [ "connect_unittests:exposed_interface" ],
......
services/service_manager/tests/connect/connect_test_class_app_manifest.json
View file @ 583d4851
......@@ -4,9 +4,9 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"connect_unittests:class": [ "service_manager::test::mojom::ClassInterface" ],
"connect_unittests:class": [ "service_manager.test.mojom.ClassInterface" ],
"connect_unittests:connect_test_service": [
"service_manager::test::mojom::ConnectTestService"
"service_manager.test.mojom.ConnectTestService"
]
}
}
......
services/service_manager/tests/connect/connect_test_package_manifest.json
View file @ 583d4851
......@@ -5,10 +5,10 @@
"service_manager:connector": {
"provides": {
"connect_unittests:connect_test_service": [
"service_manager::test::mojom::ConnectTestService"
"service_manager.test.mojom.ConnectTestService"
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
}
}
......
services/service_manager/tests/connect/connect_unittests_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"connect_unittests:exposed_interface": [
"service_manager::test::mojom::ExposedInterface"
"service_manager.test.mojom.ExposedInterface"
]
},
"requires": {
......
services/service_manager/tests/lifecycle/app_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"lifecycle_unittest:lifecycle_control": [
"service_manager::test::mojom::LifecycleControl"
"service_manager.test.mojom.LifecycleControl"
]
}
}
......
services/service_manager/tests/lifecycle/exe_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"lifecycle_unittest:lifecycle_control": [
"service_manager::test::mojom::LifecycleControl"
"service_manager.test.mojom.LifecycleControl"
]
}
}
......
services/service_manager/tests/lifecycle/package_app_a_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"lifecycle_unittest:lifecycle_control": [
"service_manager::test::mojom::LifecycleControl"
"service_manager.test.mojom.LifecycleControl"
]
}
}
......
services/service_manager/tests/lifecycle/package_app_b_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"lifecycle_unittest:lifecycle_control": [
"service_manager::test::mojom::LifecycleControl"
"service_manager.test.mojom.LifecycleControl"
]
}
}
......
services/service_manager/tests/lifecycle/package_manifest.json
View file @ 583d4851
......@@ -5,10 +5,10 @@
"service_manager:connector": {
"provides": {
"lifecycle_unittest:lifecycle_control": [
"service_manager::test::mojom::LifecycleControl"
"service_manager.test.mojom.LifecycleControl"
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
}
}
......
services/service_manager/tests/lifecycle/parent_manifest.json
View file @ 583d4851
......@@ -4,7 +4,7 @@
"interface_provider_specs": {
"service_manager:connector": {
"provides": {
"lifecycle_unittest:parent": [ "service_manager::test::mojom::Parent" ]
"lifecycle_unittest:parent": [ "service_manager.test.mojom.Parent" ]
},
"requires": {
"lifecycle_unittest_app": [
......
services/service_manager/tests/service_manager/embedder_manifest.json
View file @ 583d4851
......@@ -6,7 +6,7 @@
"provides": {
"service_manager_unittest:embedder": [ ],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
"service_manager.mojom.ServiceFactory"
]
},
"requires": {
......
services/service_manager/tests/service_manager/service_manager_unittest_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"service_manager_unittest:create_instance_test": [
"service_manager::test::mojom::CreateInstanceTest"
"service_manager.test.mojom.CreateInstanceTest"
]
},
"requires": {
......
services/service_manager/tests/shutdown/shutdown_client_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"shutdown_unittest:shutdown_test_client_controller": [
"service_manager::mojom::ShutdownTestClientController"
"service_manager.mojom.ShutdownTestClientController"
]
},
"requires": {
......
services/service_manager/tests/shutdown/shutdown_service_manifest.json
View file @ 583d4851
......@@ -5,7 +5,7 @@
"service_manager:connector": {
"provides": {
"shutdown_unittest:shutdown_test_service": [
"service_manager::mojom::ShutdownTestService"
"service_manager.mojom.ShutdownTestService"
]
},
"requires": {
......
services/shape_detection/manifest.json
View file @ 583d4851
This diff is collapsed.
services/test/echo/manifest.json
View file @ 583d4851
This diff is collapsed.
services/test/user_id/manifest.json
View file @ 583d4851
This diff is collapsed.
services/tracing/manifest.json
View file @ 583d4851
This diff is collapsed.
services/ui/manifest.json
View file @ 583d4851
This diff is collapsed.
services/ui/test_ws/manifest.json
View file @ 583d4851
This diff is collapsed.
services/ui/ws/test_manifest.json
View file @ 583d4851
This diff is collapsed.
services/ui/ws2/test_manifest.json
View file @ 583d4851
This diff is collapsed.
services/viz/manifest.json
View file @ 583d4851
This diff is collapsed.
services/viz/test_manifest.json
View file @ 583d4851
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment