| 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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 v8::Local<v8::Context> context) override; | 348 v8::Local<v8::Context> context) override; |
| 349 void AddMessageToConsole(ConsoleMessageLevel level, | 349 void AddMessageToConsole(ConsoleMessageLevel level, |
| 350 const std::string& message) override; | 350 const std::string& message) override; |
| 351 | 351 |
| 352 // blink::WebFrameClient implementation: | 352 // blink::WebFrameClient implementation: |
| 353 blink::WebPluginPlaceholder* createPluginPlaceholder( | 353 blink::WebPluginPlaceholder* createPluginPlaceholder( |
| 354 blink::WebLocalFrame*, | 354 blink::WebLocalFrame*, |
| 355 const blink::WebPluginParams&) override; | 355 const blink::WebPluginParams&) override; |
| 356 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, | 356 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, |
| 357 const blink::WebPluginParams& params); | 357 const blink::WebPluginParams& params); |
| 358 // TODO(srirama): Remove this method once blink updated. | |
| 359 virtual blink::WebMediaPlayer* createMediaPlayer( | 358 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 360 blink::WebLocalFrame* frame, | 359 blink::WebLocalFrame* frame, |
| 361 const blink::WebURL& url, | 360 const blink::WebURL& url, |
| 362 blink::WebMediaPlayerClient* client, | |
| 363 blink::WebContentDecryptionModule* initial_cdm); | |
| 364 virtual blink::WebMediaPlayer* createMediaPlayer( | |
| 365 blink::WebLocalFrame* frame, | |
| 366 const blink::WebURL& url, | |
| 367 blink::WebMediaPlayerClient* client, | 361 blink::WebMediaPlayerClient* client, |
| 368 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 362 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
| 369 blink::WebContentDecryptionModule* initial_cdm); | 363 blink::WebContentDecryptionModule* initial_cdm); |
| 370 virtual blink::WebApplicationCacheHost* createApplicationCacheHost( | 364 virtual blink::WebApplicationCacheHost* createApplicationCacheHost( |
| 371 blink::WebLocalFrame* frame, | 365 blink::WebLocalFrame* frame, |
| 372 blink::WebApplicationCacheHostClient* client); | 366 blink::WebApplicationCacheHostClient* client); |
| 373 virtual blink::WebWorkerContentSettingsClientProxy* | 367 virtual blink::WebWorkerContentSettingsClientProxy* |
| 374 createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame); | 368 createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame); |
| 375 virtual blink::WebExternalPopupMenu* createExternalPopupMenu( | 369 virtual blink::WebExternalPopupMenu* createExternalPopupMenu( |
| 376 const blink::WebPopupMenuInfo& popup_menu_info, | 370 const blink::WebPopupMenuInfo& popup_menu_info, |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 #endif | 1013 #endif |
| 1020 | 1014 |
| 1021 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1015 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 1022 | 1016 |
| 1023 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1017 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 1024 }; | 1018 }; |
| 1025 | 1019 |
| 1026 } // namespace content | 1020 } // namespace content |
| 1027 | 1021 |
| 1028 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1022 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |