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

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: Addressing feedback from mdempsky Created 5 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 class UserMediaClientImpl; 108 class UserMediaClientImpl;
109 enum class SandboxFlags; 109 enum class SandboxFlags;
110 struct CommonNavigationParams; 110 struct CommonNavigationParams;
111 struct CustomContextMenuContext; 111 struct CustomContextMenuContext;
112 struct FrameReplicationState; 112 struct FrameReplicationState;
113 struct NavigationParams; 113 struct NavigationParams;
114 struct RequestNavigationParams; 114 struct RequestNavigationParams;
115 struct ResourceResponseHead; 115 struct ResourceResponseHead;
116 struct StartNavigationParams; 116 struct StartNavigationParams;
117 struct StreamOverrideParameters; 117 struct StreamOverrideParameters;
118 class VRDispatcher;
118 119
119 class CONTENT_EXPORT RenderFrameImpl 120 class CONTENT_EXPORT RenderFrameImpl
120 : public RenderFrame, 121 : public RenderFrame,
121 NON_EXPORTED_BASE(public blink::WebFrameClient), 122 NON_EXPORTED_BASE(public blink::WebFrameClient),
122 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) { 123 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
123 public: 124 public:
124 // Creates a new RenderFrame. |render_view| is the RenderView object that this 125 // Creates a new RenderFrame. |render_view| is the RenderView object that this
125 // frame belongs to. 126 // frame belongs to.
126 // Callers *must* call |SetWebFrame| immediately after creation. 127 // Callers *must* call |SetWebFrame| immediately after creation.
127 // Note: This is called only when RenderFrame is created by Blink through 128 // Note: This is called only when RenderFrame is created by Blink through
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 const blink::WebAXObject& start_object, 531 const blink::WebAXObject& start_object,
531 int start_offset, 532 int start_offset,
532 const blink::WebAXObject& end_object, 533 const blink::WebAXObject& end_object,
533 int end_offset); 534 int end_offset);
534 virtual void didChangeManifest(blink::WebLocalFrame*); 535 virtual void didChangeManifest(blink::WebLocalFrame*);
535 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 536 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
536 virtual bool enterFullscreen(); 537 virtual bool enterFullscreen();
537 virtual bool exitFullscreen(); 538 virtual bool exitFullscreen();
538 virtual blink::WebPermissionClient* permissionClient(); 539 virtual blink::WebPermissionClient* permissionClient();
539 virtual blink::WebAppBannerClient* appBannerClient(); 540 virtual blink::WebAppBannerClient* appBannerClient();
541 blink::WebVRClient* webVRClient() override;
540 542
541 // WebMediaPlayerDelegate implementation: 543 // WebMediaPlayerDelegate implementation:
542 void DidPlay(blink::WebMediaPlayer* player) override; 544 void DidPlay(blink::WebMediaPlayer* player) override;
543 void DidPause(blink::WebMediaPlayer* player) override; 545 void DidPause(blink::WebMediaPlayer* player) override;
544 void PlayerGone(blink::WebMediaPlayer* player) override; 546 void PlayerGone(blink::WebMediaPlayer* player) override;
545 547
546 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move 548 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
547 // this back to private member. 549 // this back to private member.
548 void OnNavigate(const CommonNavigationParams& common_params, 550 void OnNavigate(const CommonNavigationParams& common_params,
549 const StartNavigationParams& start_params, 551 const StartNavigationParams& start_params,
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 AccessibilityMode accessibility_mode_; 977 AccessibilityMode accessibility_mode_;
976 978
977 // Only valid if |accessibility_mode_| is anything other than 979 // Only valid if |accessibility_mode_| is anything other than
978 // AccessibilityModeOff. 980 // AccessibilityModeOff.
979 RendererAccessibility* renderer_accessibility_; 981 RendererAccessibility* renderer_accessibility_;
980 982
981 scoped_ptr<PermissionDispatcher> permission_client_; 983 scoped_ptr<PermissionDispatcher> permission_client_;
982 984
983 scoped_ptr<blink::WebAppBannerClient> app_banner_client_; 985 scoped_ptr<blink::WebAppBannerClient> app_banner_client_;
984 986
987 // The VR dispatcher attached to the frame, lazily initialized.
988 VRDispatcher* vr_dispatcher_;
989
985 #if defined(OS_MACOSX) || defined(OS_ANDROID) 990 #if defined(OS_MACOSX) || defined(OS_ANDROID)
986 // The external popup for the currently showing select popup. 991 // The external popup for the currently showing select popup.
987 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 992 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
988 #endif 993 #endif
989 994
990 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 995 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
991 996
992 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 997 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
993 }; 998 };
994 999
995 } // namespace content 1000 } // namespace content
996 1001
997 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1002 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698