| 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 5784e8494740741363562ec91406940838170dba..f3cb41893396f3cb016b96c41430fd0d26ca9e95 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.h
|
| +++ b/content/browser/frame_host/render_frame_host_impl.h
|
| @@ -29,7 +29,6 @@
|
| #include "content/common/accessibility_mode_enums.h"
|
| #include "content/common/ax_content_node_data.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/common/frame_host.mojom.h"
|
| #include "content/common/frame_message_enums.h"
|
| #include "content/common/frame_replication_state.h"
|
| #include "content/common/image_downloader/image_downloader.mojom.h"
|
| @@ -37,8 +36,6 @@
|
| #include "content/common/navigation_params.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/common/javascript_message_type.h"
|
| -#include "mojo/public/cpp/bindings/binding.h"
|
| -#include "mojo/public/cpp/bindings/interface_request.h"
|
| #include "net/http/http_response_headers.h"
|
| #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
|
| #include "third_party/WebKit/public/web/WebTextDirection.h"
|
| @@ -99,11 +96,9 @@ struct GlobalRequestID;
|
| struct Referrer;
|
| struct ResourceResponse;
|
|
|
| -class CONTENT_EXPORT RenderFrameHostImpl
|
| - : public RenderFrameHost,
|
| - NON_EXPORTED_BASE(public mojom::FrameHost),
|
| - public BrowserAccessibilityDelegate,
|
| - public SiteInstanceImpl::Observer {
|
| +class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
|
| + public BrowserAccessibilityDelegate,
|
| + public SiteInstanceImpl::Observer {
|
| public:
|
| using AXTreeSnapshotCallback =
|
| base::Callback<void(
|
| @@ -156,10 +151,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| bool IsRenderFrameLive() override;
|
| int GetProxyCount() override;
|
|
|
| - // mojom::FrameHost
|
| - void GetHostZoomLevel(const GURL& url,
|
| - const GetHostZoomLevelCallback& callback) override;
|
| -
|
| // IPC::Sender
|
| bool Send(IPC::Message* msg) override;
|
|
|
| @@ -762,8 +753,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| FrameTreeNode* FindAndVerifyChild(int32_t child_frame_routing_id,
|
| bad_message::BadMessageReason reason);
|
|
|
| - void BindFrameHostService(mojom::FrameHostRequest request);
|
| -
|
| // Creates a Web Bluetooth Service owned by the frame.
|
| void CreateWebBluetoothService(
|
| mojo::InterfaceRequest<blink::mojom::WebBluetoothService> request);
|
| @@ -785,8 +774,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
|
|
| RenderFrameHostDelegate* delegate_;
|
|
|
| - mojo::Binding<mojom::FrameHost> frame_host_binding_;
|
| -
|
| // The SiteInstance associated with this RenderFrameHost. All content drawn
|
| // in this RenderFrameHost is part of this SiteInstance. Cannot change over
|
| // time.
|
|
|