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

Unified Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 2079943002: Change RenderFrame to use InterfaceRegistry et al. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a2
Patch Set: . Created 4 years, 6 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
Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index a412041725ad15b4819dd04ed379b7ffc57d1b38..420837657f172978949a62af4cfc543b9b281f1c 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -33,11 +33,11 @@
#include "content/common/frame_message_enums.h"
#include "content/common/frame_replication_state.h"
#include "content/common/image_downloader/image_downloader.mojom.h"
-#include "content/common/mojo/service_registry_impl.h"
#include "content/common/navigation_params.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/common/javascript_message_type.h"
#include "net/http/http_response_headers.h"
+#include "services/shell/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
#include "third_party/WebKit/public/web/WebTextDirection.h"
@@ -154,7 +154,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
void CopyImageAt(int x, int y) override;
void SaveImageAt(int x, int y) override;
RenderViewHost* GetRenderViewHost() override;
- ServiceRegistry* GetServiceRegistry() override;
+ shell::InterfaceRegistry* GetInterfaceRegistry() override;
+ shell::InterfaceProvider* GetRemoteInterfaces() override;
blink::WebPageVisibilityState GetVisibilityState() override;
bool IsRenderFrameLive() override;
int GetProxyCount() override;
@@ -714,8 +715,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
void OnHidePopup();
#endif
- // Registers Mojo services that this frame host makes available.
- void RegisterMojoServices();
+ // Registers Mojo interfaces that this frame host makes available.
+ void RegisterMojoInterfaces();
// Resets any waiting state of this RenderFrameHost that is no longer
// relevant.
@@ -947,7 +948,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
// SiteInstance. May be null in tests.
std::unique_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
- std::unique_ptr<ServiceRegistryImpl> service_registry_;
+ std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
+ std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
#if defined(OS_ANDROID)
std::unique_ptr<ServiceRegistryAndroid> service_registry_android_;
« no previous file with comments | « content/browser/frame_host/frame_mojo_shell.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698