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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 ServiceRegistry* GetServiceRegistry() override; | 275 ServiceRegistry* GetServiceRegistry() override; |
276 bool IsFTPDirectoryListing() override; | 276 bool IsFTPDirectoryListing() override; |
277 void AttachGuest(int element_instance_id) override; | 277 void AttachGuest(int element_instance_id) override; |
278 void SetSelectedText(const base::string16& selection_text, | 278 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 void EnsureMojoBuiltinsAreAvailable(v8::Isolate* isolate, | 281 void EnsureMojoBuiltinsAreAvailable(v8::Isolate* isolate, |
282 v8::Handle<v8::Context> context) override; | 282 v8::Handle<v8::Context> context) override; |
283 | 283 |
284 // blink::WebFrameClient implementation: | 284 // blink::WebFrameClient implementation: |
| 285 virtual blink::WebPluginPlaceholder* createPluginPlaceholder( |
| 286 blink::WebLocalFrame*, |
| 287 const blink::WebPluginParams&) override; |
285 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, | 288 virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, |
286 const blink::WebPluginParams& params); | 289 const blink::WebPluginParams& params); |
287 // TODO(jrummell): Remove this method once blink updated. | 290 // TODO(jrummell): Remove this method once blink updated. |
288 virtual blink::WebMediaPlayer* createMediaPlayer( | 291 virtual blink::WebMediaPlayer* createMediaPlayer( |
289 blink::WebLocalFrame* frame, | 292 blink::WebLocalFrame* frame, |
290 const blink::WebURL& url, | 293 const blink::WebURL& url, |
291 blink::WebMediaPlayerClient* client); | 294 blink::WebMediaPlayerClient* client); |
292 virtual blink::WebMediaPlayer* createMediaPlayer( | 295 virtual blink::WebMediaPlayer* createMediaPlayer( |
293 blink::WebLocalFrame* frame, | 296 blink::WebLocalFrame* frame, |
294 const blink::WebURL& url, | 297 const blink::WebURL& url, |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
780 #endif | 783 #endif |
781 | 784 |
782 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 785 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
783 | 786 |
784 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 787 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
785 }; | 788 }; |
786 | 789 |
787 } // namespace content | 790 } // namespace content |
788 | 791 |
789 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 792 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |