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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated to use Mojo as requested by eng review Created 5 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 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 class UserMediaClientImpl; 105 class UserMediaClientImpl;
106 enum class SandboxFlags; 106 enum class SandboxFlags;
107 struct CommonNavigationParams; 107 struct CommonNavigationParams;
108 struct CustomContextMenuContext; 108 struct CustomContextMenuContext;
109 struct FrameReplicationState; 109 struct FrameReplicationState;
110 struct NavigationParams; 110 struct NavigationParams;
111 struct RequestNavigationParams; 111 struct RequestNavigationParams;
112 struct ResourceResponseHead; 112 struct ResourceResponseHead;
113 struct StartNavigationParams; 113 struct StartNavigationParams;
114 struct StreamOverrideParameters; 114 struct StreamOverrideParameters;
115 class VRDispatcher;
115 116
116 class CONTENT_EXPORT RenderFrameImpl 117 class CONTENT_EXPORT RenderFrameImpl
117 : public RenderFrame, 118 : public RenderFrame,
118 NON_EXPORTED_BASE(public blink::WebFrameClient), 119 NON_EXPORTED_BASE(public blink::WebFrameClient),
119 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) { 120 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
120 public: 121 public:
121 // Creates a new RenderFrame. |render_view| is the RenderView object that this 122 // Creates a new RenderFrame. |render_view| is the RenderView object that this
122 // frame belongs to. 123 // frame belongs to.
123 // Callers *must* call |SetWebFrame| immediately after creation. 124 // Callers *must* call |SetWebFrame| immediately after creation.
124 // Note: This is called only when RenderFrame is created by Blink through 125 // Note: This is called only when RenderFrame is created by Blink through
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 int start_offset, 526 int start_offset,
526 const blink::WebAXObject& end_object, 527 const blink::WebAXObject& end_object,
527 int end_offset); 528 int end_offset);
528 virtual void didChangeManifest(blink::WebLocalFrame*); 529 virtual void didChangeManifest(blink::WebLocalFrame*);
529 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 530 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
530 virtual bool enterFullscreen(); 531 virtual bool enterFullscreen();
531 virtual bool exitFullscreen(); 532 virtual bool exitFullscreen();
532 virtual blink::WebPermissionClient* permissionClient(); 533 virtual blink::WebPermissionClient* permissionClient();
533 virtual blink::WebAppBannerClient* appBannerClient(); 534 virtual blink::WebAppBannerClient* appBannerClient();
534 535
536 #if defined(ENABLE_WEBVR)
537 blink::WebVRClient* webVRClient() override;
538 #endif
539
535 // WebMediaPlayerDelegate implementation: 540 // WebMediaPlayerDelegate implementation:
536 void DidPlay(blink::WebMediaPlayer* player) override; 541 void DidPlay(blink::WebMediaPlayer* player) override;
537 void DidPause(blink::WebMediaPlayer* player) override; 542 void DidPause(blink::WebMediaPlayer* player) override;
538 void PlayerGone(blink::WebMediaPlayer* player) override; 543 void PlayerGone(blink::WebMediaPlayer* player) override;
539 544
540 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move 545 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
541 // this back to private member. 546 // this back to private member.
542 void OnNavigate(const CommonNavigationParams& common_params, 547 void OnNavigate(const CommonNavigationParams& common_params,
543 const StartNavigationParams& start_params, 548 const StartNavigationParams& start_params,
544 const RequestNavigationParams& request_params); 549 const RequestNavigationParams& request_params);
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
963 AccessibilityMode accessibility_mode_; 968 AccessibilityMode accessibility_mode_;
964 969
965 // Only valid if |accessibility_mode_| is anything other than 970 // Only valid if |accessibility_mode_| is anything other than
966 // AccessibilityModeOff. 971 // AccessibilityModeOff.
967 RendererAccessibility* renderer_accessibility_; 972 RendererAccessibility* renderer_accessibility_;
968 973
969 scoped_ptr<PermissionDispatcher> permission_client_; 974 scoped_ptr<PermissionDispatcher> permission_client_;
970 975
971 scoped_ptr<blink::WebAppBannerClient> app_banner_client_; 976 scoped_ptr<blink::WebAppBannerClient> app_banner_client_;
972 977
978 #if defined(ENABLE_WEBVR)
979 // The VR dispatcher attached to the frame, lazily initialized.
980 scoped_ptr<VRDispatcher> vr_dispatcher_;
981 #endif
982
973 #if defined(OS_MACOSX) || defined(OS_ANDROID) 983 #if defined(OS_MACOSX) || defined(OS_ANDROID)
974 // The external popup for the currently showing select popup. 984 // The external popup for the currently showing select popup.
975 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 985 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
976 #endif 986 #endif
977 987
978 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 988 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
979 989
980 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 990 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
981 }; 991 };
982 992
983 } // namespace content 993 } // namespace content
984 994
985 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 995 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698