diff options
Diffstat (limited to 'chromium/content/public/app')
7 files changed, 41 insertions, 18 deletions
diff --git a/chromium/content/public/app/BUILD.gn b/chromium/content/public/app/BUILD.gn index 004f301cbd7..4bf09585be2 100644 --- a/chromium/content/public/app/BUILD.gn +++ b/chromium/content/public/app/BUILD.gn @@ -198,15 +198,18 @@ service_manifest("packaged_services_manifest") { "//services/viz:manifest", ] - if (enable_mus) { - packaged_services += [ "//services/ui:manifest" ] + if (is_linux) { + packaged_services += [ "//components/services/font:manifest" ] } } service_manifest("browser_manifest") { name = "content_browser" source = "mojo/content_browser_manifest.json" - packaged_services = [ "//services/file:manifest" ] + packaged_services = [ + "//services/content:manifest", + "//services/file:manifest", + ] } service_manifest("gpu_manifest") { diff --git a/chromium/content/public/app/content_main_delegate.h b/chromium/content/public/app/content_main_delegate.h index b5d8b1889d6..979e25d1c1b 100644 --- a/chromium/content/public/app/content_main_delegate.h +++ b/chromium/content/public/app/content_main_delegate.h @@ -125,6 +125,11 @@ class CONTENT_EXPORT ContentMainDelegate { const base::Closure& quit_closure, service_manager::BackgroundServiceManager* service_manager); + // Allows the embedder to perform platform-specific initializatioion. For + // example, things that should be done immediately before the creation of the + // main message loop. + virtual void PreContentInitialization() {} + protected: friend class ContentClientInitializer; diff --git a/chromium/content/public/app/content_main_runner.h b/chromium/content/public/app/content_main_runner.h index 5fec99790b5..308c22d8041 100644 --- a/chromium/content/public/app/content_main_runner.h +++ b/chromium/content/public/app/content_main_runner.h @@ -23,7 +23,7 @@ class CONTENT_EXPORT ContentMainRunner { virtual int Initialize(const ContentMainParams& params) = 0; // Perform the default run logic. - virtual int Run() = 0; + virtual int Run(bool start_service_manager_only) = 0; // Shut down the content state. virtual void Shutdown() = 0; diff --git a/chromium/content/public/app/mojo/content_browser_manifest.json b/chromium/content/public/app/mojo/content_browser_manifest.json index a515b68616a..96f8e822a91 100644 --- a/chromium/content/public/app/mojo/content_browser_manifest.json +++ b/chromium/content/public/app/mojo/content_browser_manifest.json @@ -6,6 +6,7 @@ "provides": { // Interfaces needed by a generic client of content browser. "app": [ + "content.mojom.MemoryCoordinatorHandle", "discardable_memory.mojom.DiscardableSharedMemoryManager", "memory_instrumentation.mojom.Coordinator" ], @@ -25,6 +26,9 @@ "discardable_memory.mojom.DiscardableSharedMemoryManager", "media.mojom.AndroidOverlayProvider" ], + "gpu_client": [ + "ui.mojom.Gpu" + ], "plugin": [ "discardable_memory.mojom.DiscardableSharedMemoryManager", "ui.mojom.Gpu" @@ -39,24 +43,23 @@ "blink.mojom.LockManager", "blink.mojom.Hyphenation", "blink.mojom.MimeRegistry", + "blink.mojom.PluginRegistry", "blink.mojom.ReportingServiceProxy", + "blink.mojom.StoragePartitionService", "blink.mojom.WebDatabaseHost", "content.mojom.AppCacheBackend", "content.mojom.ClipboardHost", "content.mojom.FieldTrialRecorder", "content.mojom.FrameSinkProvider", "content.mojom.MediaStreamTrackMetricsHost", - "content.mojom.MemoryCoordinatorHandle", "content.mojom.PeerConnectionTrackerHost", "content.mojom.PushMessaging", "content.mojom.RendererHost", "content.mojom.ReportingServiceProxy", "content.mojom.ServiceWorkerDispatcherHost", - "content.mojom.StoragePartitionService", "content.mojom.WorkerURLLoaderFactoryProvider", "device.mojom.BatteryMonitor", "device.mojom.GamepadHapticsManager", - "device.mojom.GamepadMonitor", "discardable_memory.mojom.DiscardableSharedMemoryManager", "media.mojom.KeySystemSupport", "media.mojom.VideoCaptureHost", @@ -78,9 +81,13 @@ "info", "debug_recording", "device_notifier", - "stream_factory" + "log_factory_manager", + "stream_factory", + "testing_api" ], "cdm": [ "media:cdm" ], + "chromecast": [ "multizone" ], + "content": [ "navigation" ], "content_gpu": [ "browser" ], "content_plugin": [ "browser" ], "content_renderer": [ "browser" ], @@ -140,10 +147,14 @@ // impossible this week. Remove once sky/ken fix this. "autofill.mojom.AutofillDriver", "autofill.mojom.PasswordManagerDriver", + "blink.mojom.AnchorElementMetricsHost", + "blink.mojom.Authenticator", "blink.mojom.BackgroundFetchService", "blink.mojom.BudgetService", "blink.mojom.CacheStorage", "blink.mojom.ColorChooserFactory", + "blink.mojom.CredentialManager", + "blink.mojom.DisplayCutoutHost", "blink.mojom.DedicatedWorkerFactory", "blink.mojom.LockManager", "blink.mojom.GeolocationService", @@ -156,9 +167,12 @@ "blink.mojom.PrefetchURLLoaderService", "blink.mojom.PresentationService", "blink.mojom.QuotaDispatcherHost", + "blink.mojom.SpeechRecognizer", "blink.mojom.TextSuggestionHost", "blink.mojom.UnhandledTapNotifier", "blink.mojom.WebBluetoothService", + "blink.test.mojom.VirtualAuthenticatorManager", + // TODO(beng): figure out how to overlay test interfaces like this. "content.mojom.BrowserTarget", @@ -170,7 +184,7 @@ "content.mojom.RendererAudioInputStreamFactory", "content.mojom.RendererAudioOutputStreamFactory", "content.mojom.SharedWorkerConnector", - "content.mojom.SpeechRecognizer", + "device.mojom.GamepadMonitor", "device.mojom.Geolocation", "device.mojom.NFC", "device.mojom.SensorProvider", @@ -190,16 +204,13 @@ "mojom.ProcessInternalsHandler", "network.mojom.RestrictedCookieManager", "network.mojom.WebSocket", - "password_manager.mojom.CredentialManager", "payments.mojom.PaymentManager", "payments.mojom.PaymentRequest", "resource_coordinator.mojom.FrameCoordinationUnit", - "shape_detection.mojom.BarcodeDetection", + "shape_detection.mojom.BarcodeDetectionProvider", "shape_detection.mojom.FaceDetectionProvider", "shape_detection.mojom.TextDetection", - "ui.mojom.Gpu", - "webauth.mojom.Authenticator", - "webauth.test.mojom.VirtualAuthenticatorManager" + "ui.mojom.Gpu" ] }, "requires": { @@ -211,6 +222,7 @@ "renderer": [ "blink.mojom.BudgetService", "blink.mojom.CacheStorage", + "blink.mojom.DedicatedWorkerFactory", "blink.mojom.LockManager", "blink.mojom.NotificationService", "blink.mojom.PermissionService", @@ -218,7 +230,7 @@ "device.mojom.UsbDeviceManager", "network.mojom.WebSocket", "payments.mojom.PaymentManager", - "shape_detection.mojom.BarcodeDetection", + "shape_detection.mojom.BarcodeDetectionProvider", "shape_detection.mojom.FaceDetectionProvider", "shape_detection.mojom.TextDetection" ] @@ -238,7 +250,7 @@ "network.mojom.RestrictedCookieManager", "network.mojom.WebSocket", "payments.mojom.PaymentManager", - "shape_detection.mojom.BarcodeDetection", + "shape_detection.mojom.BarcodeDetectionProvider", "shape_detection.mojom.FaceDetectionProvider", "shape_detection.mojom.TextDetection" ] @@ -255,7 +267,7 @@ "blink.mojom.QuotaDispatcherHost", "network.mojom.WebSocket", "payments.mojom.PaymentManager", - "shape_detection.mojom.BarcodeDetection", + "shape_detection.mojom.BarcodeDetectionProvider", "shape_detection.mojom.FaceDetectionProvider", "shape_detection.mojom.TextDetection" ] diff --git a/chromium/content/public/app/mojo/content_plugin_manifest.json b/chromium/content/public/app/mojo/content_plugin_manifest.json index 44c6d2bafa5..c00ea402962 100644 --- a/chromium/content/public/app/mojo/content_plugin_manifest.json +++ b/chromium/content/public/app/mojo/content_plugin_manifest.json @@ -25,6 +25,7 @@ "plugin" ], "device": [ "device:power_monitor" ], + "font_service": [ "font_service" ], "ui": [ "discardable_memory" ] } } diff --git a/chromium/content/public/app/mojo/content_renderer_manifest.json b/chromium/content/public/app/mojo/content_renderer_manifest.json index 71bc81d6183..70c678203f2 100644 --- a/chromium/content/public/app/mojo/content_renderer_manifest.json +++ b/chromium/content/public/app/mojo/content_renderer_manifest.json @@ -33,6 +33,7 @@ "font_loader", "renderer" ], + "font_service": [ "font_service" ], "metrics": [ "url_keyed_metrics" ], "device": [ "device:power_monitor", diff --git a/chromium/content/public/app/mojo/content_utility_manifest.json b/chromium/content/public/app/mojo/content_utility_manifest.json index 563c88580bd..2c4dcb1a8cb 100644 --- a/chromium/content/public/app/mojo/content_utility_manifest.json +++ b/chromium/content/public/app/mojo/content_utility_manifest.json @@ -29,7 +29,8 @@ "device": [ "device:power_monitor", "device:time_zone_monitor" - ] + ], + "font_service": [ "font_service" ] } } }, |