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

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

Issue 1228113004: Put the RenderFrame's ID into a per-frame WebBluetooth, and plumb that back to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@store-request-device-state-in-dispatcher
Patch Set: Initial 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
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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 545 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
546 virtual bool enterFullscreen(); 546 virtual bool enterFullscreen();
547 virtual bool exitFullscreen(); 547 virtual bool exitFullscreen();
548 virtual blink::WebPermissionClient* permissionClient(); 548 virtual blink::WebPermissionClient* permissionClient();
549 virtual blink::WebAppBannerClient* appBannerClient(); 549 virtual blink::WebAppBannerClient* appBannerClient();
550 virtual void registerProtocolHandler(const blink::WebString& scheme, 550 virtual void registerProtocolHandler(const blink::WebString& scheme,
551 const blink::WebURL& url, 551 const blink::WebURL& url,
552 const blink::WebString& title); 552 const blink::WebString& title);
553 virtual void unregisterProtocolHandler(const blink::WebString& scheme, 553 virtual void unregisterProtocolHandler(const blink::WebString& scheme,
554 const blink::WebURL& url); 554 const blink::WebURL& url);
555 virtual blink::WebBluetooth* bluetooth();
555 556
556 #if defined(ENABLE_WEBVR) 557 #if defined(ENABLE_WEBVR)
557 blink::WebVRClient* webVRClient() override; 558 blink::WebVRClient* webVRClient() override;
558 #endif 559 #endif
559 560
560 // WebMediaPlayerDelegate implementation: 561 // WebMediaPlayerDelegate implementation:
561 void DidPlay(blink::WebMediaPlayer* player) override; 562 void DidPlay(blink::WebMediaPlayer* player) override;
562 void DidPause(blink::WebMediaPlayer* player) override; 563 void DidPause(blink::WebMediaPlayer* player) override;
563 void PlayerGone(blink::WebMediaPlayer* player) override; 564 void PlayerGone(blink::WebMediaPlayer* player) override;
564 565
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 AccessibilityMode accessibility_mode_; 1002 AccessibilityMode accessibility_mode_;
1002 1003
1003 // Only valid if |accessibility_mode_| is anything other than 1004 // Only valid if |accessibility_mode_| is anything other than
1004 // AccessibilityModeOff. 1005 // AccessibilityModeOff.
1005 RendererAccessibility* renderer_accessibility_; 1006 RendererAccessibility* renderer_accessibility_;
1006 1007
1007 scoped_ptr<PermissionDispatcher> permission_client_; 1008 scoped_ptr<PermissionDispatcher> permission_client_;
1008 1009
1009 scoped_ptr<blink::WebAppBannerClient> app_banner_client_; 1010 scoped_ptr<blink::WebAppBannerClient> app_banner_client_;
1010 1011
1012 scoped_ptr<blink::WebBluetooth> bluetooth_;
1013
1011 #if defined(ENABLE_WEBVR) 1014 #if defined(ENABLE_WEBVR)
1012 // The VR dispatcher attached to the frame, lazily initialized. 1015 // The VR dispatcher attached to the frame, lazily initialized.
1013 scoped_ptr<VRDispatcher> vr_dispatcher_; 1016 scoped_ptr<VRDispatcher> vr_dispatcher_;
1014 #endif 1017 #endif
1015 1018
1016 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1019 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1017 // The external popup for the currently showing select popup. 1020 // The external popup for the currently showing select popup.
1018 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 1021 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
1019 #endif 1022 #endif
1020 1023
1021 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1024 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1022 1025
1023 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1026 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1024 }; 1027 };
1025 1028
1026 } // namespace content 1029 } // namespace content
1027 1030
1028 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1031 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698