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

Side by Side Diff: content/browser/renderer_host/render_message_filter.cc

Issue 7087028: roll clang 131935:132017 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 6 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) 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/browser/renderer_host/render_message_filter.h" 5 #include "content/browser/renderer_host/render_message_filter.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 class OpenChannelToPpapiBrokerCallback : public PpapiBrokerProcessHost::Client { 191 class OpenChannelToPpapiBrokerCallback : public PpapiBrokerProcessHost::Client {
192 public: 192 public:
193 OpenChannelToPpapiBrokerCallback(RenderMessageFilter* filter, 193 OpenChannelToPpapiBrokerCallback(RenderMessageFilter* filter,
194 int routing_id, 194 int routing_id,
195 int request_id) 195 int request_id)
196 : filter_(filter), 196 : filter_(filter),
197 routing_id_(routing_id), 197 routing_id_(routing_id),
198 request_id_(request_id) { 198 request_id_(request_id) {
199 } 199 }
200 200
201 virtual ~OpenChannelToPpapiBrokerCallback() {}
202
201 virtual void GetChannelInfo(base::ProcessHandle* renderer_handle, 203 virtual void GetChannelInfo(base::ProcessHandle* renderer_handle,
202 int* renderer_id) { 204 int* renderer_id) {
203 *renderer_handle = filter_->peer_handle(); 205 *renderer_handle = filter_->peer_handle();
204 *renderer_id = filter_->render_process_id(); 206 *renderer_id = filter_->render_process_id();
205 } 207 }
206 208
207 virtual void OnChannelOpened(base::ProcessHandle broker_process_handle, 209 virtual void OnChannelOpened(base::ProcessHandle broker_process_handle,
208 const IPC::ChannelHandle& channel_handle) { 210 const IPC::ChannelHandle& channel_handle) {
209 filter_->Send(new ViewMsg_PpapiBrokerChannelCreated(routing_id_, 211 filter_->Send(new ViewMsg_PpapiBrokerChannelCreated(routing_id_,
210 request_id_, 212 request_id_,
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 file_for_transit = base::FileDescriptor(file, true); 880 file_for_transit = base::FileDescriptor(file, true);
879 #endif 881 #endif
880 } 882 }
881 883
882 IPC::Message* reply = new ViewMsg_AsyncOpenFile_ACK( 884 IPC::Message* reply = new ViewMsg_AsyncOpenFile_ACK(
883 routing_id, error_code, file_for_transit, message_id); 885 routing_id, error_code, file_for_transit, message_id);
884 BrowserThread::PostTask( 886 BrowserThread::PostTask(
885 BrowserThread::IO, FROM_HERE, NewRunnableMethod( 887 BrowserThread::IO, FROM_HERE, NewRunnableMethod(
886 this, &RenderMessageFilter::Send, reply)); 888 this, &RenderMessageFilter::Send, reply));
887 } 889 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698