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

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

Issue 8511032: Make the Pepper Flash net address just private, not Flash-specific. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 4638 matching lines...) Expand 10 before | Expand all | Expand 10 after
4649 } 4649 }
4650 external_popup_menu_->DidSelectItem(selected_index); 4650 external_popup_menu_->DidSelectItem(selected_index);
4651 external_popup_menu_.reset(); 4651 external_popup_menu_.reset();
4652 } 4652 }
4653 #endif 4653 #endif
4654 4654
4655 #if defined(ENABLE_FLAPPER_HACKS) 4655 #if defined(ENABLE_FLAPPER_HACKS)
4656 void RenderViewImpl::OnConnectTcpACK( 4656 void RenderViewImpl::OnConnectTcpACK(
4657 int request_id, 4657 int request_id,
4658 IPC::PlatformFileForTransit socket_for_transit, 4658 IPC::PlatformFileForTransit socket_for_transit,
4659 const PP_Flash_NetAddress& local_addr, 4659 const PP_NetAddress_Private& local_addr,
4660 const PP_Flash_NetAddress& remote_addr) { 4660 const PP_NetAddress_Private& remote_addr) {
4661 pepper_delegate_.OnConnectTcpACK( 4661 pepper_delegate_.OnConnectTcpACK(
4662 request_id, 4662 request_id,
4663 IPC::PlatformFileForTransitToPlatformFile(socket_for_transit), 4663 IPC::PlatformFileForTransitToPlatformFile(socket_for_transit),
4664 local_addr, 4664 local_addr,
4665 remote_addr); 4665 remote_addr);
4666 } 4666 }
4667 #endif 4667 #endif
4668 4668
4669 void RenderViewImpl::OnContextMenuClosed( 4669 void RenderViewImpl::OnContextMenuClosed(
4670 const webkit_glue::CustomContextMenuContext& custom_context) { 4670 const webkit_glue::CustomContextMenuContext& custom_context) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
4704 return webview()->settings()->useThreadedCompositor(); 4704 return webview()->settings()->useThreadedCompositor();
4705 } 4705 }
4706 4706
4707 void RenderViewImpl::OnJavaBridgeInit( 4707 void RenderViewImpl::OnJavaBridgeInit(
4708 const IPC::ChannelHandle& channel_handle) { 4708 const IPC::ChannelHandle& channel_handle) {
4709 DCHECK(!java_bridge_dispatcher_.get()); 4709 DCHECK(!java_bridge_dispatcher_.get());
4710 #if defined(ENABLE_JAVA_BRIDGE) 4710 #if defined(ENABLE_JAVA_BRIDGE)
4711 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4711 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4712 #endif 4712 #endif
4713 } 4713 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698