| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 33b8427eaaf772edf0eff9248052948d58397b84..7fb5901ba6016d0828ba5912f0d4ded7911899c1 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -86,6 +86,7 @@ class MidiDispatcher;
|
| class NotificationPermissionDispatcher;
|
| class PageState;
|
| class PepperPluginInstanceImpl;
|
| +class PermissionsManager;
|
| class PresentationDispatcher;
|
| class PushMessagingDispatcher;
|
| class RendererAccessibility;
|
| @@ -518,9 +519,10 @@ class CONTENT_EXPORT RenderFrameImpl
|
| virtual void didChangeManifest(blink::WebLocalFrame*);
|
| virtual bool enterFullscreen();
|
| virtual bool exitFullscreen();
|
| - void suddenTerminationDisablerChanged(
|
| + virtual void suddenTerminationDisablerChanged(
|
| bool present,
|
| - blink::WebFrameClient::SuddenTerminationDisablerType type) override;
|
| + blink::WebFrameClient::SuddenTerminationDisablerType type);
|
| + virtual blink::WebPermissionClient* permissionClient();
|
|
|
| // WebMediaPlayerDelegate implementation:
|
| void DidPlay(blink::WebMediaPlayer* player) override;
|
| @@ -872,6 +874,8 @@ class CONTENT_EXPORT RenderFrameImpl
|
| // AccessibilityModeOff.
|
| RendererAccessibility* renderer_accessibility_;
|
|
|
| + scoped_ptr<PermissionsManager> permission_client_;
|
| +
|
| #if defined(OS_MACOSX) || defined(OS_ANDROID)
|
| // The external popup for the currently showing select popup.
|
| scoped_ptr<ExternalPopupMenu> external_popup_menu_;
|
|
|