OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" | 5 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" |
6 | 6 |
7 #include "content/common/browser_plugin/browser_plugin_constants.h" | 7 #include "content/common/browser_plugin/browser_plugin_constants.h" |
8 #include "content/common/browser_plugin/browser_plugin_messages.h" | 8 #include "content/common/browser_plugin/browser_plugin_messages.h" |
9 #include "content/common/cursors/webcursor.h" | 9 #include "content/common/cursors/webcursor.h" |
10 #include "content/renderer/browser_plugin/browser_plugin.h" | 10 #include "content/renderer/browser_plugin/browser_plugin.h" |
11 #include "content/renderer/render_thread_impl.h" | 11 #include "content/renderer/render_thread_impl.h" |
12 #include "ui/gfx/point.h" | 12 #include "ui/gfx/point.h" |
13 | 13 |
14 namespace content { | 14 namespace content { |
15 | 15 |
16 BrowserPluginManagerImpl::BrowserPluginManagerImpl(RenderViewImpl* render_view) | 16 BrowserPluginManagerImpl::BrowserPluginManagerImpl(RenderViewImpl* render_view) |
17 : BrowserPluginManager(render_view) { | 17 : BrowserPluginManager(render_view) { |
18 } | 18 } |
19 | 19 |
20 BrowserPluginManagerImpl::~BrowserPluginManagerImpl() { | 20 BrowserPluginManagerImpl::~BrowserPluginManagerImpl() { |
21 } | 21 } |
22 | 22 |
23 BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin( | 23 BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin( |
24 RenderViewImpl* render_view, | 24 RenderViewImpl* render_view, |
25 blink::WebFrame* frame, | 25 blink::WebFrame* frame, |
26 bool auto_navigate) { | 26 bool auto_navigate, |
Fady Samuel
2014/08/29 18:52:32
Get rid of auto_navigate and mime_type and pass in
lazyboy
2014/08/29 22:08:25
Done.
| |
27 return new BrowserPlugin(render_view, frame, auto_navigate); | 27 const std::string& mime_type) { |
28 return new BrowserPlugin(render_view, frame, auto_navigate, mime_type); | |
28 } | 29 } |
29 | 30 |
30 bool BrowserPluginManagerImpl::Send(IPC::Message* msg) { | 31 bool BrowserPluginManagerImpl::Send(IPC::Message* msg) { |
31 return RenderThread::Get()->Send(msg); | 32 return RenderThread::Get()->Send(msg); |
32 } | 33 } |
33 | 34 |
34 bool BrowserPluginManagerImpl::OnMessageReceived( | 35 bool BrowserPluginManagerImpl::OnMessageReceived( |
35 const IPC::Message& message) { | 36 const IPC::Message& message) { |
36 if (BrowserPlugin::ShouldForwardToBrowserPlugin(message)) { | 37 if (BrowserPlugin::ShouldForwardToBrowserPlugin(message)) { |
37 int browser_plugin_instance_id = browser_plugin::kInstanceIDNone; | 38 int browser_plugin_instance_id = browser_plugin::kInstanceIDNone; |
(...skipping 12 matching lines...) Expand all Loading... | |
50 | 51 |
51 void BrowserPluginManagerImpl::DidCommitCompositorFrame() { | 52 void BrowserPluginManagerImpl::DidCommitCompositorFrame() { |
52 IDMap<BrowserPlugin>::iterator iter(&instances_); | 53 IDMap<BrowserPlugin>::iterator iter(&instances_); |
53 while (!iter.IsAtEnd()) { | 54 while (!iter.IsAtEnd()) { |
54 iter.GetCurrentValue()->DidCommitCompositorFrame(); | 55 iter.GetCurrentValue()->DidCommitCompositorFrame(); |
55 iter.Advance(); | 56 iter.Advance(); |
56 } | 57 } |
57 } | 58 } |
58 | 59 |
59 } // namespace content | 60 } // namespace content |
OLD | NEW |