| Index: content/renderer/browser_plugin/browser_plugin_manager_impl.cc
|
| diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
|
| index 5ce7ebbd9863335c30fe7bd2f1d990e261eeb05d..de0088d0655bd10394a920722e2b2c131bf7c668 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
|
| @@ -15,8 +15,7 @@ namespace content {
|
|
|
| BrowserPluginManagerImpl::BrowserPluginManagerImpl(
|
| RenderViewImpl* render_view)
|
| - : BrowserPluginManager(render_view),
|
| - request_id_counter_(0) {
|
| + : BrowserPluginManager(render_view) {
|
| }
|
|
|
| BrowserPluginManagerImpl::~BrowserPluginManagerImpl() {
|
| @@ -29,15 +28,6 @@ BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin(
|
| return new BrowserPlugin(render_view, frame, auto_navigate);
|
| }
|
|
|
| -void BrowserPluginManagerImpl::AllocateInstanceID(
|
| - const base::WeakPtr<BrowserPlugin>& browser_plugin) {
|
| - int request_id = ++request_id_counter_;
|
| - pending_allocate_guest_instance_id_requests_.insert(
|
| - std::make_pair(request_id, browser_plugin));
|
| - Send(new BrowserPluginHostMsg_AllocateInstanceID(
|
| - browser_plugin->render_view_routing_id(), request_id));
|
| -}
|
| -
|
| bool BrowserPluginManagerImpl::Send(IPC::Message* msg) {
|
| return RenderThread::Get()->Send(msg);
|
| }
|
| @@ -56,13 +46,7 @@ bool BrowserPluginManagerImpl::OnMessageReceived(
|
| return true;
|
| }
|
|
|
| - bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(BrowserPluginManagerImpl, message)
|
| - IPC_MESSAGE_HANDLER(BrowserPluginMsg_AllocateInstanceID_ACK,
|
| - OnAllocateInstanceIDACK)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| + return false;
|
| }
|
|
|
| void BrowserPluginManagerImpl::DidCommitCompositorFrame() {
|
| @@ -73,19 +57,4 @@ void BrowserPluginManagerImpl::DidCommitCompositorFrame() {
|
| }
|
| }
|
|
|
| -void BrowserPluginManagerImpl::OnAllocateInstanceIDACK(
|
| - int request_id,
|
| - int guest_instance_id) {
|
| - InstanceIDMap::iterator it =
|
| - pending_allocate_guest_instance_id_requests_.find(request_id);
|
| - if (it == pending_allocate_guest_instance_id_requests_.end())
|
| - return;
|
| -
|
| - const base::WeakPtr<BrowserPlugin> plugin(it->second);
|
| - if (!plugin)
|
| - return;
|
| - pending_allocate_guest_instance_id_requests_.erase(request_id);
|
| - plugin->OnInstanceIDAllocated(guest_instance_id);
|
| -}
|
| -
|
| } // namespace content
|
|
|