| 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 "ppapi/proxy/plugin_dispatcher.h" | 5 #include "ppapi/proxy/plugin_dispatcher.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "ppapi/proxy/plugin_var_serialization_rules.h" | 29 #include "ppapi/proxy/plugin_var_serialization_rules.h" |
| 30 #include "ppapi/proxy/ppapi_messages.h" | 30 #include "ppapi/proxy/ppapi_messages.h" |
| 31 #include "ppapi/proxy/ppb_instance_proxy.h" | 31 #include "ppapi/proxy/ppb_instance_proxy.h" |
| 32 #include "ppapi/proxy/ppp_class_proxy.h" | 32 #include "ppapi/proxy/ppp_class_proxy.h" |
| 33 #include "ppapi/proxy/resource_creation_proxy.h" | 33 #include "ppapi/proxy/resource_creation_proxy.h" |
| 34 #include "ppapi/proxy/resource_reply_thread_registrar.h" | 34 #include "ppapi/proxy/resource_reply_thread_registrar.h" |
| 35 #include "ppapi/shared_impl/ppapi_globals.h" | 35 #include "ppapi/shared_impl/ppapi_globals.h" |
| 36 #include "ppapi/shared_impl/proxy_lock.h" | 36 #include "ppapi/shared_impl/proxy_lock.h" |
| 37 #include "ppapi/shared_impl/resource.h" | 37 #include "ppapi/shared_impl/resource.h" |
| 38 | 38 |
| 39 #if defined(OS_POSIX) && !defined(OS_NACL) | |
| 40 #include "ipc/ipc_channel_posix.h" | |
| 41 #endif | |
| 42 | |
| 43 namespace ppapi { | 39 namespace ppapi { |
| 44 namespace proxy { | 40 namespace proxy { |
| 45 | 41 |
| 46 namespace { | 42 namespace { |
| 47 | 43 |
| 48 typedef std::map<PP_Instance, PluginDispatcher*> InstanceToDispatcherMap; | 44 typedef std::map<PP_Instance, PluginDispatcher*> InstanceToDispatcherMap; |
| 49 InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; | 45 InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; |
| 50 | 46 |
| 51 typedef std::set<PluginDispatcher*> DispatcherSet; | 47 typedef std::set<PluginDispatcher*> DispatcherSet; |
| 52 DispatcherSet* g_live_dispatchers = NULL; | 48 DispatcherSet* g_live_dispatchers = NULL; |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 // once they're set. The user will have to restart to get new font prefs | 336 // once they're set. The user will have to restart to get new font prefs |
| 341 // propogated to plugins. | 337 // propogated to plugins. |
| 342 if (!received_preferences_) { | 338 if (!received_preferences_) { |
| 343 received_preferences_ = true; | 339 received_preferences_ = true; |
| 344 preferences_ = prefs; | 340 preferences_ = prefs; |
| 345 } | 341 } |
| 346 } | 342 } |
| 347 | 343 |
| 348 } // namespace proxy | 344 } // namespace proxy |
| 349 } // namespace ppapi | 345 } // namespace ppapi |
| OLD | NEW |