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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "content/common/accessibility_mode_enums.h" 25 #include "content/common/accessibility_mode_enums.h"
26 #include "content/common/frame.mojom.h" 26 #include "content/common/frame.mojom.h"
27 #include "content/common/frame_message_enums.h" 27 #include "content/common/frame_message_enums.h"
28 #include "content/public/common/console_message_level.h" 28 #include "content/public/common/console_message_level.h"
29 #include "content/public/common/javascript_message_type.h" 29 #include "content/public/common/javascript_message_type.h"
30 #include "content/public/common/referrer.h" 30 #include "content/public/common/referrer.h"
31 #include "content/public/common/stop_find_action.h" 31 #include "content/public/common/stop_find_action.h"
32 #include "content/public/renderer/render_frame.h" 32 #include "content/public/renderer/render_frame.h"
33 #include "content/renderer/frame_blame_context.h" 33 #include "content/renderer/frame_blame_context.h"
34 #include "content/renderer/mojo/blink_service_registry_impl.h" 34 #include "content/renderer/mojo/blink_interface_provider_impl.h"
35 #include "content/renderer/renderer_webcookiejar_impl.h" 35 #include "content/renderer/renderer_webcookiejar_impl.h"
36 #include "ipc/ipc_message.h" 36 #include "ipc/ipc_message.h"
37 #include "ipc/ipc_platform_file.h" 37 #include "ipc/ipc_platform_file.h"
38 #include "media/blink/webmediaplayer_delegate.h" 38 #include "media/blink/webmediaplayer_delegate.h"
39 #include "media/blink/webmediaplayer_params.h" 39 #include "media/blink/webmediaplayer_params.h"
40 #include "mojo/public/cpp/bindings/binding.h" 40 #include "mojo/public/cpp/bindings/binding.h"
41 #include "services/shell/public/interfaces/connector.mojom.h" 41 #include "services/shell/public/interfaces/connector.mojom.h"
42 #include "services/shell/public/interfaces/interface_provider.mojom.h" 42 #include "services/shell/public/interfaces/interface_provider.mojom.h"
43 #include "third_party/WebKit/public/platform/WebEffectiveConnectionType.h" 43 #include "third_party/WebKit/public/platform/WebEffectiveConnectionType.h"
44 #include "third_party/WebKit/public/platform/WebFocusType.h" 44 #include "third_party/WebKit/public/platform/WebFocusType.h"
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 void registerProtocolHandler(const blink::WebString& scheme, 626 void registerProtocolHandler(const blink::WebString& scheme,
627 const blink::WebURL& url, 627 const blink::WebURL& url,
628 const blink::WebString& title) override; 628 const blink::WebString& title) override;
629 void unregisterProtocolHandler(const blink::WebString& scheme, 629 void unregisterProtocolHandler(const blink::WebString& scheme,
630 const blink::WebURL& url) override; 630 const blink::WebURL& url) override;
631 blink::WebBluetooth* bluetooth() override; 631 blink::WebBluetooth* bluetooth() override;
632 void checkIfAudioSinkExistsAndIsAuthorized( 632 void checkIfAudioSinkExistsAndIsAuthorized(
633 const blink::WebString& sink_id, 633 const blink::WebString& sink_id,
634 const blink::WebSecurityOrigin& security_origin, 634 const blink::WebSecurityOrigin& security_origin,
635 blink::WebSetSinkIdCallbacks* web_callbacks) override; 635 blink::WebSetSinkIdCallbacks* web_callbacks) override;
636 blink::ServiceRegistry* serviceRegistry() override; 636 blink::InterfaceProvider* interfaceProvider() override;
637 blink::WebPageVisibilityState visibilityState() const override; 637 blink::WebPageVisibilityState visibilityState() const override;
638 638
639 // WebFrameSerializerClient implementation: 639 // WebFrameSerializerClient implementation:
640 void didSerializeDataForFrame( 640 void didSerializeDataForFrame(
641 const blink::WebCString& data, 641 const blink::WebCString& data,
642 blink::WebFrameSerializerClient::FrameSerializationStatus status) 642 blink::WebFrameSerializerClient::FrameSerializationStatus status)
643 override; 643 override;
644 644
645 // Binds to the FrameHost in the browser. 645 // Binds to the FrameHost in the browser.
646 void Bind(mojom::FrameRequest frame, mojom::FrameHostPtr frame_host); 646 void Bind(mojom::FrameRequest frame, mojom::FrameHostPtr frame_host);
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 1194
1195 // The push messaging dispatcher attached to this frame, lazily initialized. 1195 // The push messaging dispatcher attached to this frame, lazily initialized.
1196 PushMessagingDispatcher* push_messaging_dispatcher_; 1196 PushMessagingDispatcher* push_messaging_dispatcher_;
1197 1197
1198 // The presentation dispatcher implementation attached to this frame, lazily 1198 // The presentation dispatcher implementation attached to this frame, lazily
1199 // initialized. 1199 // initialized.
1200 PresentationDispatcher* presentation_dispatcher_; 1200 PresentationDispatcher* presentation_dispatcher_;
1201 1201
1202 std::unique_ptr<shell::InterfaceRegistry> interface_registry_; 1202 std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
1203 std::unique_ptr<shell::InterfaceProvider> remote_interfaces_; 1203 std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
1204 std::unique_ptr<BlinkServiceRegistryImpl> blink_service_registry_; 1204 std::unique_ptr<BlinkInterfaceProviderImpl> blink_interface_provider_;
1205 shell::mojom::InterfaceProviderRequest 1205 shell::mojom::InterfaceProviderRequest
1206 pending_remote_interface_provider_request_; 1206 pending_remote_interface_provider_request_;
1207 1207
1208 // The shell proxy used to connect to Mojo applications. 1208 // The shell proxy used to connect to Mojo applications.
1209 shell::mojom::ConnectorPtr connector_; 1209 shell::mojom::ConnectorPtr connector_;
1210 1210
1211 // The screen orientation dispatcher attached to the frame, lazily 1211 // The screen orientation dispatcher attached to the frame, lazily
1212 // initialized. 1212 // initialized.
1213 ScreenOrientationDispatcher* screen_orientation_dispatcher_; 1213 ScreenOrientationDispatcher* screen_orientation_dispatcher_;
1214 1214
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1278 mojom::FrameHostPtr frame_host_; 1278 mojom::FrameHostPtr frame_host_;
1279 1279
1280 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1280 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1281 1281
1282 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1282 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1283 }; 1283 };
1284 1284
1285 } // namespace content 1285 } // namespace content
1286 1286
1287 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1287 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698