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

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

Issue 1808203005: [OnionSoup] Moving VR service from content to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reworked as per new comments. Fixed build errors! Created 4 years, 7 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 class UserMediaClientImpl; 152 class UserMediaClientImpl;
153 class WakeLockDispatcher; 153 class WakeLockDispatcher;
154 struct CommonNavigationParams; 154 struct CommonNavigationParams;
155 struct CustomContextMenuContext; 155 struct CustomContextMenuContext;
156 struct FrameReplicationState; 156 struct FrameReplicationState;
157 struct NavigationParams; 157 struct NavigationParams;
158 struct RequestNavigationParams; 158 struct RequestNavigationParams;
159 struct ResourceResponseHead; 159 struct ResourceResponseHead;
160 struct StartNavigationParams; 160 struct StartNavigationParams;
161 struct StreamOverrideParameters; 161 struct StreamOverrideParameters;
162 class VRDispatcher;
163 162
164 class CONTENT_EXPORT RenderFrameImpl 163 class CONTENT_EXPORT RenderFrameImpl
165 : public RenderFrame, 164 : public RenderFrame,
166 NON_EXPORTED_BASE(public blink::WebFrameClient), 165 NON_EXPORTED_BASE(public blink::WebFrameClient),
167 NON_EXPORTED_BASE(public blink::WebFrameSerializerClient) { 166 NON_EXPORTED_BASE(public blink::WebFrameSerializerClient) {
168 public: 167 public:
169 // Creates a new RenderFrame as the main frame of |render_view|. 168 // Creates a new RenderFrame as the main frame of |render_view|.
170 static RenderFrameImpl* CreateMainFrame( 169 static RenderFrameImpl* CreateMainFrame(
171 RenderViewImpl* render_view, 170 RenderViewImpl* render_view,
172 int32_t routing_id, 171 int32_t routing_id,
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 const blink::WebString& title) override; 614 const blink::WebString& title) override;
616 void unregisterProtocolHandler(const blink::WebString& scheme, 615 void unregisterProtocolHandler(const blink::WebString& scheme,
617 const blink::WebURL& url) override; 616 const blink::WebURL& url) override;
618 blink::WebBluetooth* bluetooth() override; 617 blink::WebBluetooth* bluetooth() override;
619 void checkIfAudioSinkExistsAndIsAuthorized( 618 void checkIfAudioSinkExistsAndIsAuthorized(
620 const blink::WebString& sink_id, 619 const blink::WebString& sink_id,
621 const blink::WebSecurityOrigin& security_origin, 620 const blink::WebSecurityOrigin& security_origin,
622 blink::WebSetSinkIdCallbacks* web_callbacks) override; 621 blink::WebSetSinkIdCallbacks* web_callbacks) override;
623 blink::ServiceRegistry* serviceRegistry() override; 622 blink::ServiceRegistry* serviceRegistry() override;
624 623
625 #if defined(ENABLE_WEBVR)
626 blink::WebVRClient* webVRClient() override;
627 #endif
628
629 // WebFrameSerializerClient implementation: 624 // WebFrameSerializerClient implementation:
630 void didSerializeDataForFrame( 625 void didSerializeDataForFrame(
631 const blink::WebCString& data, 626 const blink::WebCString& data,
632 blink::WebFrameSerializerClient::FrameSerializationStatus status) 627 blink::WebFrameSerializerClient::FrameSerializationStatus status)
633 override; 628 override;
634 629
635 // Binds this render frame's service registry. 630 // Binds this render frame's service registry.
636 void BindServiceRegistry(shell::mojom::InterfaceProviderRequest services, 631 void BindServiceRegistry(shell::mojom::InterfaceProviderRequest services,
637 shell::mojom::InterfaceProviderPtr exposed_services); 632 shell::mojom::InterfaceProviderPtr exposed_services);
638 633
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 bool is_using_lofi_; 1195 bool is_using_lofi_;
1201 1196
1202 // Whether or not this RenderFrame is currently pasting. 1197 // Whether or not this RenderFrame is currently pasting.
1203 bool is_pasting_; 1198 bool is_pasting_;
1204 1199
1205 // Whether we must stop creating nested message loops for modal dialogs. This 1200 // Whether we must stop creating nested message loops for modal dialogs. This
1206 // is necessary because modal dialogs have a ScopedPageLoadDeferrer on the 1201 // is necessary because modal dialogs have a ScopedPageLoadDeferrer on the
1207 // stack that interferes with swapping out. 1202 // stack that interferes with swapping out.
1208 bool suppress_further_dialogs_; 1203 bool suppress_further_dialogs_;
1209 1204
1210 #if defined(ENABLE_WEBVR)
1211 // The VR dispatcher attached to the frame, lazily initialized.
1212 std::unique_ptr<VRDispatcher> vr_dispatcher_;
1213 #endif
1214
1215 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1205 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1216 // The external popup for the currently showing select popup. 1206 // The external popup for the currently showing select popup.
1217 std::unique_ptr<ExternalPopupMenu> external_popup_menu_; 1207 std::unique_ptr<ExternalPopupMenu> external_popup_menu_;
1218 #endif 1208 #endif
1219 1209
1220 FrameBlameContext* blame_context_; // Not owned. 1210 FrameBlameContext* blame_context_; // Not owned.
1221 1211
1222 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1212 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1223 1213
1224 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1214 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1225 }; 1215 };
1226 1216
1227 } // namespace content 1217 } // namespace content
1228 1218
1229 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1219 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698