OLD | NEW |
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 } | 207 } |
208 logging::LoggingSettings settings; | 208 logging::LoggingSettings settings; |
209 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 209 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
210 logging::InitLogging(settings); | 210 logging::InitLogging(settings); |
211 command_line_and_logging_initialized = true; | 211 command_line_and_logging_initialized = true; |
212 } | 212 } |
213 // Tell the process-global GetInterface which interfaces it can return to the | 213 // Tell the process-global GetInterface which interfaces it can return to the |
214 // plugin. | 214 // plugin. |
215 ppapi::proxy::InterfaceList::SetProcessGlobalPermissions( | 215 ppapi::proxy::InterfaceList::SetProcessGlobalPermissions( |
216 args.permissions); | 216 args.permissions); |
| 217 ppapi::proxy::InterfaceList::SetSupportsDevChannel( |
| 218 args.supports_dev_channel); |
217 | 219 |
218 int32_t error = ::PPP_InitializeModule( | 220 int32_t error = ::PPP_InitializeModule( |
219 0 /* module */, | 221 0 /* module */, |
220 &ppapi::proxy::PluginDispatcher::GetBrowserInterface); | 222 &ppapi::proxy::PluginDispatcher::GetBrowserInterface); |
221 if (error) | 223 if (error) |
222 ::exit(error); | 224 ::exit(error); |
223 | 225 |
224 PluginDispatcher* dispatcher = | 226 PluginDispatcher* dispatcher = |
225 new PluginDispatcher(::PPP_GetInterface, args.permissions, | 227 new PluginDispatcher(::PPP_GetInterface, args.permissions, |
226 args.off_the_record); | 228 args.off_the_record); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 return 1; | 288 return 1; |
287 } | 289 } |
288 | 290 |
289 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); | 291 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); |
290 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); | 292 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); |
291 | 293 |
292 loop.Run(); | 294 loop.Run(); |
293 | 295 |
294 return 0; | 296 return 0; |
295 } | 297 } |
OLD | NEW |