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

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

Powered by Google App Engine
This is Rietveld 408576698