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 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 5251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5262 IPC::PlatformFileForTransit file_for_transit, | 5262 IPC::PlatformFileForTransit file_for_transit, |
5263 int message_id) { | 5263 int message_id) { |
5264 pepper_delegate_.OnAsyncFileOpened( | 5264 pepper_delegate_.OnAsyncFileOpened( |
5265 error_code, | 5265 error_code, |
5266 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 5266 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
5267 message_id); | 5267 message_id); |
5268 } | 5268 } |
5269 | 5269 |
5270 void RenderViewImpl::OnPpapiBrokerChannelCreated( | 5270 void RenderViewImpl::OnPpapiBrokerChannelCreated( |
5271 int request_id, | 5271 int request_id, |
5272 base::ProcessHandle broker_process_handle, | |
5273 const IPC::ChannelHandle& handle) { | 5272 const IPC::ChannelHandle& handle) { |
5274 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id, | 5273 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id, |
5275 broker_process_handle, | |
5276 handle); | 5274 handle); |
5277 } | 5275 } |
5278 | 5276 |
5279 #if defined(OS_MACOSX) | 5277 #if defined(OS_MACOSX) |
5280 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { | 5278 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { |
5281 if (external_popup_menu_ == NULL) { | 5279 if (external_popup_menu_ == NULL) { |
5282 // Crash reports from the field indicate that we can be notified with a | 5280 // Crash reports from the field indicate that we can be notified with a |
5283 // NULL external popup menu (we probably get notified twice). | 5281 // NULL external popup menu (we probably get notified twice). |
5284 // If you hit this please file a bug against jcivelli and include the page | 5282 // If you hit this please file a bug against jcivelli and include the page |
5285 // and steps to repro. | 5283 // and steps to repro. |
(...skipping 25 matching lines...) Expand all Loading... |
5311 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5309 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5312 return !!RenderThreadImpl::current()->compositor_thread(); | 5310 return !!RenderThreadImpl::current()->compositor_thread(); |
5313 } | 5311 } |
5314 | 5312 |
5315 void RenderViewImpl::OnJavaBridgeInit() { | 5313 void RenderViewImpl::OnJavaBridgeInit() { |
5316 DCHECK(!java_bridge_dispatcher_.get()); | 5314 DCHECK(!java_bridge_dispatcher_.get()); |
5317 #if defined(ENABLE_JAVA_BRIDGE) | 5315 #if defined(ENABLE_JAVA_BRIDGE) |
5318 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5316 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5319 #endif | 5317 #endif |
5320 } | 5318 } |
OLD | NEW |