Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 10854040: Add hooks to content to request permission to connect to the PPAPI broker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/plugins/ppapi/plugin_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted, 938 IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted,
939 OnPluginImeCompositionCompleted) 939 OnPluginImeCompositionCompleted)
940 #endif 940 #endif
941 IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent, 941 IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent,
942 OnSetEditCommandsForNextKeyEvent) 942 OnSetEditCommandsForNextKeyEvent)
943 IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction, 943 IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction,
944 OnCustomContextMenuAction) 944 OnCustomContextMenuAction)
945 IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenFile_ACK, OnAsyncFileOpened) 945 IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenFile_ACK, OnAsyncFileOpened)
946 IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerChannelCreated, 946 IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerChannelCreated,
947 OnPpapiBrokerChannelCreated) 947 OnPpapiBrokerChannelCreated)
948 IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerPermissionResult,
949 OnPpapiBrokerPermissionResult)
948 IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage, 950 IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage,
949 OnGetAllSavableResourceLinksForCurrentPage) 951 OnGetAllSavableResourceLinksForCurrentPage)
950 IPC_MESSAGE_HANDLER( 952 IPC_MESSAGE_HANDLER(
951 ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks, 953 ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks,
952 OnGetSerializedHtmlDataForCurrentPageWithLocalLinks) 954 OnGetSerializedHtmlDataForCurrentPageWithLocalLinks)
953 #if defined(OS_MACOSX) 955 #if defined(OS_MACOSX)
954 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) 956 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItem, OnSelectPopupMenuItem)
955 #elif defined(OS_ANDROID) 957 #elif defined(OS_ANDROID)
956 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) 958 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
957 #endif 959 #endif
(...skipping 4782 matching lines...) Expand 10 before | Expand all | Expand 10 after
5740 message_id); 5742 message_id);
5741 } 5743 }
5742 5744
5743 void RenderViewImpl::OnPpapiBrokerChannelCreated( 5745 void RenderViewImpl::OnPpapiBrokerChannelCreated(
5744 int request_id, 5746 int request_id,
5745 const IPC::ChannelHandle& handle) { 5747 const IPC::ChannelHandle& handle) {
5746 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id, 5748 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id,
5747 handle); 5749 handle);
5748 } 5750 }
5749 5751
5752 void RenderViewImpl::OnPpapiBrokerPermissionResult(
5753 int request_id,
5754 bool result) {
5755 pepper_delegate_.OnPpapiBrokerPermissionResult(request_id, result);
5756 }
5757
5750 #if defined(OS_MACOSX) 5758 #if defined(OS_MACOSX)
5751 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { 5759 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) {
5752 if (external_popup_menu_ == NULL) { 5760 if (external_popup_menu_ == NULL) {
5753 // Crash reports from the field indicate that we can be notified with a 5761 // Crash reports from the field indicate that we can be notified with a
5754 // NULL external popup menu (we probably get notified twice). 5762 // NULL external popup menu (we probably get notified twice).
5755 // If you hit this please file a bug against jcivelli and include the page 5763 // If you hit this please file a bug against jcivelli and include the page
5756 // and steps to repro. 5764 // and steps to repro.
5757 NOTREACHED(); 5765 NOTREACHED();
5758 return; 5766 return;
5759 } 5767 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
5798 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5806 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5799 return !!RenderThreadImpl::current()->compositor_thread(); 5807 return !!RenderThreadImpl::current()->compositor_thread();
5800 } 5808 }
5801 5809
5802 void RenderViewImpl::OnJavaBridgeInit() { 5810 void RenderViewImpl::OnJavaBridgeInit() {
5803 DCHECK(!java_bridge_dispatcher_); 5811 DCHECK(!java_bridge_dispatcher_);
5804 #if defined(ENABLE_JAVA_BRIDGE) 5812 #if defined(ENABLE_JAVA_BRIDGE)
5805 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5813 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5806 #endif 5814 #endif
5807 } 5815 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/plugins/ppapi/plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698