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

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

Issue 1198513003: Revert "Adding Chrome-side WebVR interface and Cardboard implementation" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « content/renderer/BUILD.gn ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 class ScreenOrientationDispatcher; 107 class ScreenOrientationDispatcher;
108 class UserMediaClientImpl; 108 class UserMediaClientImpl;
109 struct CommonNavigationParams; 109 struct CommonNavigationParams;
110 struct CustomContextMenuContext; 110 struct CustomContextMenuContext;
111 struct FrameReplicationState; 111 struct FrameReplicationState;
112 struct NavigationParams; 112 struct NavigationParams;
113 struct RequestNavigationParams; 113 struct RequestNavigationParams;
114 struct ResourceResponseHead; 114 struct ResourceResponseHead;
115 struct StartNavigationParams; 115 struct StartNavigationParams;
116 struct StreamOverrideParameters; 116 struct StreamOverrideParameters;
117 class VRDispatcher;
118 117
119 class CONTENT_EXPORT RenderFrameImpl 118 class CONTENT_EXPORT RenderFrameImpl
120 : public RenderFrame, 119 : public RenderFrame,
121 NON_EXPORTED_BASE(public blink::WebFrameClient), 120 NON_EXPORTED_BASE(public blink::WebFrameClient),
122 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) { 121 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
123 public: 122 public:
124 // Creates a new RenderFrame. |render_view| is the RenderView object that this 123 // Creates a new RenderFrame. |render_view| is the RenderView object that this
125 // frame belongs to. 124 // frame belongs to.
126 // Callers *must* call |SetWebFrame| immediately after creation. 125 // Callers *must* call |SetWebFrame| immediately after creation.
127 // Note: This is called only when RenderFrame is created by Blink through 126 // Note: This is called only when RenderFrame is created by Blink through
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 int start_offset, 523 int start_offset,
525 const blink::WebAXObject& end_object, 524 const blink::WebAXObject& end_object,
526 int end_offset); 525 int end_offset);
527 virtual void didChangeManifest(blink::WebLocalFrame*); 526 virtual void didChangeManifest(blink::WebLocalFrame*);
528 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 527 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
529 virtual bool enterFullscreen(); 528 virtual bool enterFullscreen();
530 virtual bool exitFullscreen(); 529 virtual bool exitFullscreen();
531 virtual blink::WebPermissionClient* permissionClient(); 530 virtual blink::WebPermissionClient* permissionClient();
532 virtual blink::WebAppBannerClient* appBannerClient(); 531 virtual blink::WebAppBannerClient* appBannerClient();
533 532
534 #if defined(ENABLE_WEBVR)
535 blink::WebVRClient* webVRClient() override;
536 #endif
537
538 // WebMediaPlayerDelegate implementation: 533 // WebMediaPlayerDelegate implementation:
539 void DidPlay(blink::WebMediaPlayer* player) override; 534 void DidPlay(blink::WebMediaPlayer* player) override;
540 void DidPause(blink::WebMediaPlayer* player) override; 535 void DidPause(blink::WebMediaPlayer* player) override;
541 void PlayerGone(blink::WebMediaPlayer* player) override; 536 void PlayerGone(blink::WebMediaPlayer* player) override;
542 537
543 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move 538 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
544 // this back to private member. 539 // this back to private member.
545 void OnNavigate(const CommonNavigationParams& common_params, 540 void OnNavigate(const CommonNavigationParams& common_params,
546 const StartNavigationParams& start_params, 541 const StartNavigationParams& start_params,
547 const RequestNavigationParams& request_params); 542 const RequestNavigationParams& request_params);
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 AccessibilityMode accessibility_mode_; 965 AccessibilityMode accessibility_mode_;
971 966
972 // Only valid if |accessibility_mode_| is anything other than 967 // Only valid if |accessibility_mode_| is anything other than
973 // AccessibilityModeOff. 968 // AccessibilityModeOff.
974 RendererAccessibility* renderer_accessibility_; 969 RendererAccessibility* renderer_accessibility_;
975 970
976 scoped_ptr<PermissionDispatcher> permission_client_; 971 scoped_ptr<PermissionDispatcher> permission_client_;
977 972
978 scoped_ptr<blink::WebAppBannerClient> app_banner_client_; 973 scoped_ptr<blink::WebAppBannerClient> app_banner_client_;
979 974
980 #if defined(ENABLE_WEBVR)
981 // The VR dispatcher attached to the frame, lazily initialized.
982 scoped_ptr<VRDispatcher> vr_dispatcher_;
983 #endif
984
985 #if defined(OS_MACOSX) || defined(OS_ANDROID) 975 #if defined(OS_MACOSX) || defined(OS_ANDROID)
986 // The external popup for the currently showing select popup. 976 // The external popup for the currently showing select popup.
987 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 977 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
988 #endif 978 #endif
989 979
990 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 980 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
991 981
992 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 982 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
993 }; 983 };
994 984
995 } // namespace content 985 } // namespace content
996 986
997 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 987 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/BUILD.gn ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698