Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: content/renderer/render_thread_impl.h

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.h
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 5bd84a603407a8f87f2b27291721ad3aababb4f0..c64f9d7c53191e811f1fa485e5a8baf54f156152 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -446,8 +446,8 @@ class CONTENT_EXPORT RenderThreadImpl
void RegisterPendingRenderFrameConnect(
int routing_id,
- mojo::InterfaceRequest<mojo::InterfaceProvider> services,
- mojo::InterfaceProviderPtr exposed_services);
+ mojo::shell::mojom::InterfaceProviderRequest services,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services);
protected:
RenderThreadImpl(const InProcessChildThreadParams& params,
@@ -669,14 +669,16 @@ class CONTENT_EXPORT RenderThreadImpl
public:
PendingRenderFrameConnect(
int routing_id,
- mojo::InterfaceRequest<mojo::InterfaceProvider> services,
- mojo::InterfaceProviderPtr exposed_services);
+ mojo::shell::mojom::InterfaceProviderRequest services,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services);
- mojo::InterfaceRequest<mojo::InterfaceProvider>& services() {
+ mojo::shell::mojom::InterfaceProviderRequest& services() {
return services_;
}
- mojo::InterfaceProviderPtr& exposed_services() { return exposed_services_; }
+ mojo::shell::mojom::InterfaceProviderPtr& exposed_services() {
+ return exposed_services_;
+ }
private:
friend class base::RefCounted<PendingRenderFrameConnect>;
@@ -687,8 +689,8 @@ class CONTENT_EXPORT RenderThreadImpl
void OnConnectionError();
int routing_id_;
- mojo::InterfaceRequest<mojo::InterfaceProvider> services_;
- mojo::InterfaceProviderPtr exposed_services_;
+ mojo::shell::mojom::InterfaceProviderRequest services_;
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services_;
};
typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>>
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698