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

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: Remove mention of frames from content/child. 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 539 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
540 virtual bool enterFullscreen(); 540 virtual bool enterFullscreen();
541 virtual bool exitFullscreen(); 541 virtual bool exitFullscreen();
542 virtual blink::WebPermissionClient* permissionClient(); 542 virtual blink::WebPermissionClient* permissionClient();
543 virtual blink::WebAppBannerClient* appBannerClient(); 543 virtual blink::WebAppBannerClient* appBannerClient();
544 virtual void registerProtocolHandler(const blink::WebString& scheme, 544 virtual void registerProtocolHandler(const blink::WebString& scheme,
545 const blink::WebURL& url, 545 const blink::WebURL& url,
546 const blink::WebString& title); 546 const blink::WebString& title);
547 virtual void unregisterProtocolHandler(const blink::WebString& scheme, 547 virtual void unregisterProtocolHandler(const blink::WebString& scheme,
548 const blink::WebURL& url); 548 const blink::WebURL& url);
549 virtual blink::WebBluetooth* bluetooth();
549 550
550 #if defined(ENABLE_WEBVR) 551 #if defined(ENABLE_WEBVR)
551 blink::WebVRClient* webVRClient() override; 552 blink::WebVRClient* webVRClient() override;
552 #endif 553 #endif
553 554
554 // WebMediaPlayerDelegate implementation: 555 // WebMediaPlayerDelegate implementation:
555 void DidPlay(blink::WebMediaPlayer* player) override; 556 void DidPlay(blink::WebMediaPlayer* player) override;
556 void DidPause(blink::WebMediaPlayer* player) override; 557 void DidPause(blink::WebMediaPlayer* player) override;
557 void PlayerGone(blink::WebMediaPlayer* player) override; 558 void PlayerGone(blink::WebMediaPlayer* player) override;
558 559
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 AccessibilityMode accessibility_mode_; 996 AccessibilityMode accessibility_mode_;
996 997
997 // Only valid if |accessibility_mode_| is anything other than 998 // Only valid if |accessibility_mode_| is anything other than
998 // AccessibilityModeOff. 999 // AccessibilityModeOff.
999 RendererAccessibility* renderer_accessibility_; 1000 RendererAccessibility* renderer_accessibility_;
1000 1001
1001 scoped_ptr<PermissionDispatcher> permission_client_; 1002 scoped_ptr<PermissionDispatcher> permission_client_;
1002 1003
1003 scoped_ptr<blink::WebAppBannerClient> app_banner_client_; 1004 scoped_ptr<blink::WebAppBannerClient> app_banner_client_;
1004 1005
1006 scoped_ptr<blink::WebBluetooth> bluetooth_;
1007
1005 #if defined(ENABLE_WEBVR) 1008 #if defined(ENABLE_WEBVR)
1006 // The VR dispatcher attached to the frame, lazily initialized. 1009 // The VR dispatcher attached to the frame, lazily initialized.
1007 scoped_ptr<VRDispatcher> vr_dispatcher_; 1010 scoped_ptr<VRDispatcher> vr_dispatcher_;
1008 #endif 1011 #endif
1009 1012
1010 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1013 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1011 // The external popup for the currently showing select popup. 1014 // The external popup for the currently showing select popup.
1012 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 1015 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
1013 #endif 1016 #endif
1014 1017
1015 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1018 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1016 1019
1017 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1020 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1018 }; 1021 };
1019 1022
1020 } // namespace content 1023 } // namespace content
1021 1024
1022 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1025 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698