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

Side by Side Diff: ppapi/proxy/dispatcher.cc

Issue 7466008: Reland http://codereview.chromium.org/7452002/ again (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | « ppapi/examples/file_chooser/file_chooser.cc ('k') | ppapi/proxy/ppapi_messages.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) 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 "ppapi/proxy/dispatcher.h" 5 #include "ppapi/proxy/dispatcher.h"
6 6
7 #include <string.h> // For memset. 7 #include <string.h> // For memset.
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 AddPPB(PPB_Var_Proxy::GetInfo()); 158 AddPPB(PPB_Var_Proxy::GetInfo());
159 159
160 #ifdef ENABLE_FLAPPER_HACKS 160 #ifdef ENABLE_FLAPPER_HACKS
161 AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo()); 161 AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo());
162 #endif 162 #endif
163 163
164 // PPP (plugin) interfaces. 164 // PPP (plugin) interfaces.
165 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); 165 AddPPP(PPP_Graphics3D_Proxy::GetInfo());
166 AddPPP(PPP_InputEvent_Proxy::GetInfo()); 166 AddPPP(PPP_InputEvent_Proxy::GetInfo());
167 AddPPP(PPP_Instance_Private_Proxy::GetInfo()); 167 AddPPP(PPP_Instance_Private_Proxy::GetInfo());
168 AddPPP(PPP_Instance_Proxy::GetInfo0_5()); 168 AddPPP(PPP_Instance_Proxy::GetInfo1_0());
169 } 169 }
170 170
171 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { 171 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
172 DCHECK(name_to_plugin_info_.find(info->name) == 172 DCHECK(name_to_plugin_info_.find(info->name) ==
173 name_to_plugin_info_.end()); 173 name_to_plugin_info_.end());
174 DCHECK(info->id >= INTERFACE_ID_NONE && info->id < INTERFACE_ID_COUNT); 174 DCHECK(info->id >= INTERFACE_ID_NONE && info->id < INTERFACE_ID_COUNT);
175 175
176 name_to_plugin_info_[info->name] = info; 176 name_to_plugin_info_[info->name] = info;
177 } 177 }
178 178
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 return delegate()->GetIPCMessageLoop(); 263 return delegate()->GetIPCMessageLoop();
264 } 264 }
265 265
266 void Dispatcher::AddIOThreadMessageFilter( 266 void Dispatcher::AddIOThreadMessageFilter(
267 IPC::ChannelProxy::MessageFilter* filter) { 267 IPC::ChannelProxy::MessageFilter* filter) {
268 channel()->AddFilter(filter); 268 channel()->AddFilter(filter);
269 } 269 }
270 270
271 } // namespace proxy 271 } // namespace proxy
272 } // namespace pp 272 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/examples/file_chooser/file_chooser.cc ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698