| OLD | NEW |
| 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 242 |
| 243 // May return NULL in some cases, especially if userMediaClient() returns | 243 // May return NULL in some cases, especially if userMediaClient() returns |
| 244 // NULL. | 244 // NULL. |
| 245 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 245 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
| 246 | 246 |
| 247 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 247 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 248 void DidHideExternalPopupMenu(); | 248 void DidHideExternalPopupMenu(); |
| 249 #endif | 249 #endif |
| 250 | 250 |
| 251 // IPC::Sender | 251 // IPC::Sender |
| 252 virtual bool Send(IPC::Message* msg) OVERRIDE; | 252 virtual bool Send(IPC::Message* msg) override; |
| 253 | 253 |
| 254 // IPC::Listener | 254 // IPC::Listener |
| 255 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; | 255 virtual bool OnMessageReceived(const IPC::Message& msg) override; |
| 256 | 256 |
| 257 // RenderFrame implementation: | 257 // RenderFrame implementation: |
| 258 virtual RenderView* GetRenderView() OVERRIDE; | 258 virtual RenderView* GetRenderView() override; |
| 259 virtual int GetRoutingID() OVERRIDE; | 259 virtual int GetRoutingID() override; |
| 260 virtual blink::WebLocalFrame* GetWebFrame() OVERRIDE; | 260 virtual blink::WebLocalFrame* GetWebFrame() override; |
| 261 virtual WebPreferences& GetWebkitPreferences() OVERRIDE; | 261 virtual WebPreferences& GetWebkitPreferences() override; |
| 262 virtual int ShowContextMenu(ContextMenuClient* client, | 262 virtual int ShowContextMenu(ContextMenuClient* client, |
| 263 const ContextMenuParams& params) OVERRIDE; | 263 const ContextMenuParams& params) override; |
| 264 virtual void CancelContextMenu(int request_id) OVERRIDE; | 264 virtual void CancelContextMenu(int request_id) override; |
| 265 virtual blink::WebNode GetContextMenuNode() const OVERRIDE; | 265 virtual blink::WebNode GetContextMenuNode() const override; |
| 266 virtual blink::WebPlugin* CreatePlugin( | 266 virtual blink::WebPlugin* CreatePlugin( |
| 267 blink::WebFrame* frame, | 267 blink::WebFrame* frame, |
| 268 const WebPluginInfo& info, | 268 const WebPluginInfo& info, |
| 269 const blink::WebPluginParams& params) OVERRIDE; | 269 const blink::WebPluginParams& params) override; |
| 270 virtual void LoadURLExternally(blink::WebLocalFrame* frame, | 270 virtual void LoadURLExternally(blink::WebLocalFrame* frame, |
| 271 const blink::WebURLRequest& request, | 271 const blink::WebURLRequest& request, |
| 272 blink::WebNavigationPolicy policy) OVERRIDE; | 272 blink::WebNavigationPolicy policy) override; |
| 273 virtual void ExecuteJavaScript(const base::string16& javascript) OVERRIDE; | 273 virtual void ExecuteJavaScript(const base::string16& javascript) override; |
| 274 virtual bool IsHidden() OVERRIDE; | 274 virtual bool IsHidden() override; |
| 275 virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; | 275 virtual ServiceRegistry* GetServiceRegistry() override; |
| 276 virtual bool IsFTPDirectoryListing() OVERRIDE; | 276 virtual bool IsFTPDirectoryListing() override; |
| 277 virtual void AttachGuest(int element_instance_id) OVERRIDE; | 277 virtual void AttachGuest(int element_instance_id) override; |
| 278 virtual void SetSelectedText(const base::string16& selection_text, | 278 virtual void SetSelectedText(const base::string16& selection_text, |
| 279 size_t offset, | 279 size_t offset, |
| 280 const gfx::Range& range) OVERRIDE; | 280 const gfx::Range& range) override; |
| 281 | 281 |
| 282 // blink::WebFrameClient implementation: | 282 // blink::WebFrameClient implementation: |
| 283 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, | 283 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, |
| 284 const blink::WebPluginParams& params); | 284 const blink::WebPluginParams& params); |
| 285 // TODO(jrummell): Remove this method once blink updated. | 285 // TODO(jrummell): Remove this method once blink updated. |
| 286 virtual blink::WebMediaPlayer* createMediaPlayer( | 286 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 287 blink::WebLocalFrame* frame, | 287 blink::WebLocalFrame* frame, |
| 288 const blink::WebURL& url, | 288 const blink::WebURL& url, |
| 289 blink::WebMediaPlayerClient* client); | 289 blink::WebMediaPlayerClient* client); |
| 290 virtual blink::WebMediaPlayer* createMediaPlayer( | 290 virtual blink::WebMediaPlayer* createMediaPlayer( |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 virtual void didLoseWebGLContext(blink::WebLocalFrame* frame, | 451 virtual void didLoseWebGLContext(blink::WebLocalFrame* frame, |
| 452 int arb_robustness_status_code); | 452 int arb_robustness_status_code); |
| 453 virtual void forwardInputEvent(const blink::WebInputEvent* event); | 453 virtual void forwardInputEvent(const blink::WebInputEvent* event); |
| 454 virtual blink::WebScreenOrientationClient* webScreenOrientationClient(); | 454 virtual blink::WebScreenOrientationClient* webScreenOrientationClient(); |
| 455 virtual bool isControlledByServiceWorker(); | 455 virtual bool isControlledByServiceWorker(); |
| 456 virtual void postAccessibilityEvent(const blink::WebAXObject& obj, | 456 virtual void postAccessibilityEvent(const blink::WebAXObject& obj, |
| 457 blink::WebAXEvent event); | 457 blink::WebAXEvent event); |
| 458 virtual void didChangeManifest(blink::WebLocalFrame*); | 458 virtual void didChangeManifest(blink::WebLocalFrame*); |
| 459 | 459 |
| 460 // WebMediaPlayerDelegate implementation: | 460 // WebMediaPlayerDelegate implementation: |
| 461 virtual void DidPlay(blink::WebMediaPlayer* player) OVERRIDE; | 461 virtual void DidPlay(blink::WebMediaPlayer* player) override; |
| 462 virtual void DidPause(blink::WebMediaPlayer* player) OVERRIDE; | 462 virtual void DidPause(blink::WebMediaPlayer* player) override; |
| 463 virtual void PlayerGone(blink::WebMediaPlayer* player) OVERRIDE; | 463 virtual void PlayerGone(blink::WebMediaPlayer* player) override; |
| 464 | 464 |
| 465 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move | 465 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move |
| 466 // this back to private member. | 466 // this back to private member. |
| 467 void OnNavigate(const FrameMsg_Navigate_Params& params); | 467 void OnNavigate(const FrameMsg_Navigate_Params& params); |
| 468 | 468 |
| 469 // Binds this render frame's service registry to a handle to the remote | 469 // Binds this render frame's service registry to a handle to the remote |
| 470 // service registry. | 470 // service registry. |
| 471 void BindServiceRegistry( | 471 void BindServiceRegistry( |
| 472 mojo::ScopedMessagePipeHandle service_provider_handle); | 472 mojo::ScopedMessagePipeHandle service_provider_handle); |
| 473 | 473 |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 #endif | 773 #endif |
| 774 | 774 |
| 775 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 775 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 776 | 776 |
| 777 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 777 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 778 }; | 778 }; |
| 779 | 779 |
| 780 } // namespace content | 780 } // namespace content |
| 781 | 781 |
| 782 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 782 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |