| 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); | |
| 219 | 217 |
| 220 int32_t error = ::PPP_InitializeModule( | 218 int32_t error = ::PPP_InitializeModule( |
| 221 0 /* module */, | 219 0 /* module */, |
| 222 &ppapi::proxy::PluginDispatcher::GetBrowserInterface); | 220 &ppapi::proxy::PluginDispatcher::GetBrowserInterface); |
| 223 if (error) | 221 if (error) |
| 224 ::exit(error); | 222 ::exit(error); |
| 225 | 223 |
| 226 PluginDispatcher* dispatcher = | 224 PluginDispatcher* dispatcher = |
| 227 new PluginDispatcher(::PPP_GetInterface, args.permissions, | 225 new PluginDispatcher(::PPP_GetInterface, args.permissions, |
| 228 args.off_the_record); | 226 args.off_the_record); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 return 1; | 279 return 1; |
| 282 } | 280 } |
| 283 | 281 |
| 284 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); | 282 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); |
| 285 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); | 283 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); |
| 286 | 284 |
| 287 loop.Run(); | 285 loop.Run(); |
| 288 | 286 |
| 289 return 0; | 287 return 0; |
| 290 } | 288 } |
| OLD | NEW |