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

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

Issue 1234413006: Move the Web Bluetooth implementation from child/ to renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Rebase Created 5 years, 5 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/bluetooth/web_bluetooth_impl.cc ('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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 534 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
535 virtual bool enterFullscreen(); 535 virtual bool enterFullscreen();
536 virtual bool exitFullscreen(); 536 virtual bool exitFullscreen();
537 virtual blink::WebPermissionClient* permissionClient(); 537 virtual blink::WebPermissionClient* permissionClient();
538 virtual blink::WebAppBannerClient* appBannerClient(); 538 virtual blink::WebAppBannerClient* appBannerClient();
539 virtual void registerProtocolHandler(const blink::WebString& scheme, 539 virtual void registerProtocolHandler(const blink::WebString& scheme,
540 const blink::WebURL& url, 540 const blink::WebURL& url,
541 const blink::WebString& title); 541 const blink::WebString& title);
542 virtual void unregisterProtocolHandler(const blink::WebString& scheme, 542 virtual void unregisterProtocolHandler(const blink::WebString& scheme,
543 const blink::WebURL& url); 543 const blink::WebURL& url);
544 virtual blink::WebBluetooth* bluetooth();
544 545
545 #if defined(ENABLE_WEBVR) 546 #if defined(ENABLE_WEBVR)
546 blink::WebVRClient* webVRClient() override; 547 blink::WebVRClient* webVRClient() override;
547 #endif 548 #endif
548 549
549 // WebMediaPlayerDelegate implementation: 550 // WebMediaPlayerDelegate implementation:
550 void DidPlay(blink::WebMediaPlayer* player) override; 551 void DidPlay(blink::WebMediaPlayer* player) override;
551 void DidPause(blink::WebMediaPlayer* player) override; 552 void DidPause(blink::WebMediaPlayer* player) override;
552 void PlayerGone(blink::WebMediaPlayer* player) override; 553 void PlayerGone(blink::WebMediaPlayer* player) override;
553 554
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 AccessibilityMode accessibility_mode_; 991 AccessibilityMode accessibility_mode_;
991 992
992 // Only valid if |accessibility_mode_| is anything other than 993 // Only valid if |accessibility_mode_| is anything other than
993 // AccessibilityModeOff. 994 // AccessibilityModeOff.
994 RendererAccessibility* renderer_accessibility_; 995 RendererAccessibility* renderer_accessibility_;
995 996
996 scoped_ptr<PermissionDispatcher> permission_client_; 997 scoped_ptr<PermissionDispatcher> permission_client_;
997 998
998 scoped_ptr<blink::WebAppBannerClient> app_banner_client_; 999 scoped_ptr<blink::WebAppBannerClient> app_banner_client_;
999 1000
1001 scoped_ptr<blink::WebBluetooth> bluetooth_;
1002
1000 #if defined(ENABLE_WEBVR) 1003 #if defined(ENABLE_WEBVR)
1001 // The VR dispatcher attached to the frame, lazily initialized. 1004 // The VR dispatcher attached to the frame, lazily initialized.
1002 scoped_ptr<VRDispatcher> vr_dispatcher_; 1005 scoped_ptr<VRDispatcher> vr_dispatcher_;
1003 #endif 1006 #endif
1004 1007
1005 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1008 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1006 // The external popup for the currently showing select popup. 1009 // The external popup for the currently showing select popup.
1007 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 1010 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
1008 #endif 1011 #endif
1009 1012
1010 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1013 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1011 1014
1012 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1015 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1013 }; 1016 };
1014 1017
1015 } // namespace content 1018 } // namespace content
1016 1019
1017 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1020 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/bluetooth/web_bluetooth_impl.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698