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

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

Issue 10957021: PPAPI/NaCl: Set the PluginProxyDelegate for the IPC proxy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « no previous file | no next file » | 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) 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 // Need to include this before most other files because it defines 9 // Need to include this before most other files because it defines
10 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define 10 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 253 }
254 254
255 int32_t error = ::PPP_InitializeModule( 255 int32_t error = ::PPP_InitializeModule(
256 0 /* module */, 256 0 /* module */,
257 &ppapi::proxy::PluginDispatcher::GetBrowserInterface); 257 &ppapi::proxy::PluginDispatcher::GetBrowserInterface);
258 // TODO(dmichael): Handle other error conditions, like failure to connect? 258 // TODO(dmichael): Handle other error conditions, like failure to connect?
259 if (error) 259 if (error)
260 return error; 260 return error;
261 261
262 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); 262 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy());
263 PluginGlobals::Get()->set_plugin_proxy_delegate(&ppapi_dispatcher);
bbudge 2012/09/20 18:15:24 Can't you use plugin_globals, above?
263 264
264 loop.Run(); 265 loop.Run();
265 266
266 NaClSrpcModuleFini(); 267 NaClSrpcModuleFini();
267 268
268 return 0; 269 return 0;
269 } 270 }
270 271
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698