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/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 6336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6347 IPC::PlatformFileForTransit file_for_transit, | 6347 IPC::PlatformFileForTransit file_for_transit, |
6348 int message_id) { | 6348 int message_id) { |
6349 pepper_helper_->OnAsyncFileOpened( | 6349 pepper_helper_->OnAsyncFileOpened( |
6350 error_code, | 6350 error_code, |
6351 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 6351 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
6352 message_id); | 6352 message_id); |
6353 } | 6353 } |
6354 | 6354 |
6355 void RenderViewImpl::OnPpapiBrokerChannelCreated( | 6355 void RenderViewImpl::OnPpapiBrokerChannelCreated( |
6356 int request_id, | 6356 int request_id, |
| 6357 base::ProcessId broker_pid, |
6357 const IPC::ChannelHandle& handle) { | 6358 const IPC::ChannelHandle& handle) { |
6358 pepper_helper_->OnPpapiBrokerChannelCreated(request_id, | 6359 pepper_helper_->OnPpapiBrokerChannelCreated(request_id, broker_pid, handle); |
6359 handle); | |
6360 } | 6360 } |
6361 | 6361 |
6362 void RenderViewImpl::OnPpapiBrokerPermissionResult( | 6362 void RenderViewImpl::OnPpapiBrokerPermissionResult( |
6363 int request_id, | 6363 int request_id, |
6364 bool result) { | 6364 bool result) { |
6365 pepper_helper_->OnPpapiBrokerPermissionResult(request_id, result); | 6365 pepper_helper_->OnPpapiBrokerPermissionResult(request_id, result); |
6366 } | 6366 } |
6367 | 6367 |
6368 #if defined(OS_MACOSX) | 6368 #if defined(OS_MACOSX) |
6369 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { | 6369 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6505 } | 6505 } |
6506 #endif | 6506 #endif |
6507 | 6507 |
6508 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6508 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6509 TransportDIB::Handle dib_handle) { | 6509 TransportDIB::Handle dib_handle) { |
6510 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6510 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6511 RenderProcess::current()->ReleaseTransportDIB(dib); | 6511 RenderProcess::current()->ReleaseTransportDIB(dib); |
6512 } | 6512 } |
6513 | 6513 |
6514 } // namespace content | 6514 } // namespace content |
OLD | NEW |