| 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 const gfx::Range& range) override; | 339 const gfx::Range& range) override; |
| 340 void EnsureMojoBuiltinsAreAvailable(v8::Isolate* isolate, | 340 void EnsureMojoBuiltinsAreAvailable(v8::Isolate* isolate, |
| 341 v8::Local<v8::Context> context) override; | 341 v8::Local<v8::Context> context) override; |
| 342 | 342 |
| 343 // blink::WebFrameClient implementation: | 343 // blink::WebFrameClient implementation: |
| 344 blink::WebPluginPlaceholder* createPluginPlaceholder( | 344 blink::WebPluginPlaceholder* createPluginPlaceholder( |
| 345 blink::WebLocalFrame*, | 345 blink::WebLocalFrame*, |
| 346 const blink::WebPluginParams&) override; | 346 const blink::WebPluginParams&) override; |
| 347 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, | 347 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, |
| 348 const blink::WebPluginParams& params); | 348 const blink::WebPluginParams& params); |
| 349 // TODO(jrummell): Remove this method once blink updated. | |
| 350 virtual blink::WebMediaPlayer* createMediaPlayer( | 349 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 351 blink::WebLocalFrame* frame, | 350 blink::WebLocalFrame* frame, |
| 352 const blink::WebURL& url, | 351 const blink::WebURL& url, |
| 353 blink::WebMediaPlayerClient* client); | |
| 354 virtual blink::WebMediaPlayer* createMediaPlayer( | |
| 355 blink::WebLocalFrame* frame, | |
| 356 const blink::WebURL& url, | |
| 357 blink::WebMediaPlayerClient* client, | 352 blink::WebMediaPlayerClient* client, |
| 358 blink::WebContentDecryptionModule* initial_cdm); | 353 blink::WebContentDecryptionModule* initial_cdm); |
| 359 virtual blink::WebApplicationCacheHost* createApplicationCacheHost( | 354 virtual blink::WebApplicationCacheHost* createApplicationCacheHost( |
| 360 blink::WebLocalFrame* frame, | 355 blink::WebLocalFrame* frame, |
| 361 blink::WebApplicationCacheHostClient* client); | 356 blink::WebApplicationCacheHostClient* client); |
| 362 virtual blink::WebWorkerContentSettingsClientProxy* | 357 virtual blink::WebWorkerContentSettingsClientProxy* |
| 363 createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame); | 358 createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame); |
| 364 virtual blink::WebExternalPopupMenu* createExternalPopupMenu( | 359 virtual blink::WebExternalPopupMenu* createExternalPopupMenu( |
| 365 const blink::WebPopupMenuInfo& popup_menu_info, | 360 const blink::WebPopupMenuInfo& popup_menu_info, |
| 366 blink::WebExternalPopupMenuClient* popup_menu_client); | 361 blink::WebExternalPopupMenuClient* popup_menu_client); |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 #endif | 975 #endif |
| 981 | 976 |
| 982 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 977 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 983 | 978 |
| 984 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 979 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 985 }; | 980 }; |
| 986 | 981 |
| 987 } // namespace content | 982 } // namespace content |
| 988 | 983 |
| 989 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 984 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |