Move shell service to toplevel shell namespace
Also scoped_ptr -> unique_ptr in //services/shell
since this has to touch all that code anyway.
BUG=None
[email protected]
[email protected] for mojom (renaming some things)
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1882423004
Cr-Commit-Position: refs/heads/master@{#387208}
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 28379f06..2ff20c0 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -454,8 +454,8 @@
void RegisterPendingRenderFrameConnect(
int routing_id,
- mojo::shell::mojom::InterfaceProviderRequest services,
- mojo::shell::mojom::InterfaceProviderPtr exposed_services);
+ shell::mojom::InterfaceProviderRequest services,
+ shell::mojom::InterfaceProviderPtr exposed_services);
mojom::StoragePartitionService* GetStoragePartitionService();
@@ -686,14 +686,12 @@
public:
PendingRenderFrameConnect(
int routing_id,
- mojo::shell::mojom::InterfaceProviderRequest services,
- mojo::shell::mojom::InterfaceProviderPtr exposed_services);
+ shell::mojom::InterfaceProviderRequest services,
+ shell::mojom::InterfaceProviderPtr exposed_services);
- mojo::shell::mojom::InterfaceProviderRequest& services() {
- return services_;
- }
+ shell::mojom::InterfaceProviderRequest& services() { return services_; }
- mojo::shell::mojom::InterfaceProviderPtr& exposed_services() {
+ shell::mojom::InterfaceProviderPtr& exposed_services() {
return exposed_services_;
}
@@ -706,8 +704,8 @@
void OnConnectionError();
int routing_id_;
- mojo::shell::mojom::InterfaceProviderRequest services_;
- mojo::shell::mojom::InterfaceProviderPtr exposed_services_;
+ shell::mojom::InterfaceProviderRequest services_;
+ shell::mojom::InterfaceProviderPtr exposed_services_;
};
typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>>
