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

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: fix 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
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 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted, 933 IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted,
934 OnPluginImeCompositionCompleted) 934 OnPluginImeCompositionCompleted)
935 #endif 935 #endif
936 IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent, 936 IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent,
937 OnSetEditCommandsForNextKeyEvent) 937 OnSetEditCommandsForNextKeyEvent)
938 IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction, 938 IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction,
939 OnCustomContextMenuAction) 939 OnCustomContextMenuAction)
940 IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenFile_ACK, OnAsyncFileOpened) 940 IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenFile_ACK, OnAsyncFileOpened)
941 IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerChannelCreated, 941 IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerChannelCreated,
942 OnPpapiBrokerChannelCreated) 942 OnPpapiBrokerChannelCreated)
943 IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerPermissionResult,
944 OnPpapiBrokerPermissionResult)
943 IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage, 945 IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage,
944 OnGetAllSavableResourceLinksForCurrentPage) 946 OnGetAllSavableResourceLinksForCurrentPage)
945 IPC_MESSAGE_HANDLER( 947 IPC_MESSAGE_HANDLER(
946 ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks, 948 ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks,
947 OnGetSerializedHtmlDataForCurrentPageWithLocalLinks) 949 OnGetSerializedHtmlDataForCurrentPageWithLocalLinks)
948 #if defined(OS_MACOSX) 950 #if defined(OS_MACOSX)
949 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) 951 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItem, OnSelectPopupMenuItem)
950 #elif defined(OS_ANDROID) 952 #elif defined(OS_ANDROID)
951 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) 953 IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
952 #endif 954 #endif
(...skipping 4763 matching lines...) Expand 10 before | Expand all | Expand 10 after
5716 message_id); 5718 message_id);
5717 } 5719 }
5718 5720
5719 void RenderViewImpl::OnPpapiBrokerChannelCreated( 5721 void RenderViewImpl::OnPpapiBrokerChannelCreated(
5720 int request_id, 5722 int request_id,
5721 const IPC::ChannelHandle& handle) { 5723 const IPC::ChannelHandle& handle) {
5722 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id, 5724 pepper_delegate_.OnPpapiBrokerChannelCreated(request_id,
5723 handle); 5725 handle);
5724 } 5726 }
5725 5727
5728 void RenderViewImpl::OnPpapiBrokerPermissionResult(
5729 int request_id,
5730 bool result) {
5731 pepper_delegate_.OnPpapiBrokerPermissionResult(request_id, result);
5732 }
5733
5726 #if defined(OS_MACOSX) 5734 #if defined(OS_MACOSX)
5727 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) { 5735 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) {
5728 if (external_popup_menu_ == NULL) { 5736 if (external_popup_menu_ == NULL) {
5729 // Crash reports from the field indicate that we can be notified with a 5737 // Crash reports from the field indicate that we can be notified with a
5730 // NULL external popup menu (we probably get notified twice). 5738 // NULL external popup menu (we probably get notified twice).
5731 // If you hit this please file a bug against jcivelli and include the page 5739 // If you hit this please file a bug against jcivelli and include the page
5732 // and steps to repro. 5740 // and steps to repro.
5733 NOTREACHED(); 5741 NOTREACHED();
5734 return; 5742 return;
5735 } 5743 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
5774 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5782 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5775 return !!RenderThreadImpl::current()->compositor_thread(); 5783 return !!RenderThreadImpl::current()->compositor_thread();
5776 } 5784 }
5777 5785
5778 void RenderViewImpl::OnJavaBridgeInit() { 5786 void RenderViewImpl::OnJavaBridgeInit() {
5779 DCHECK(!java_bridge_dispatcher_); 5787 DCHECK(!java_bridge_dispatcher_);
5780 #if defined(ENABLE_JAVA_BRIDGE) 5788 #if defined(ENABLE_JAVA_BRIDGE)
5781 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5789 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5782 #endif 5790 #endif
5783 } 5791 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698