OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #include "native_client/src/shared/imc/nacl_imc_c.h" | 7 #include "native_client/src/shared/imc/nacl_imc_c.h" |
8 #include "native_client/src/shared/platform/nacl_time.h" | 8 #include "native_client/src/shared/platform/nacl_time.h" |
9 #include "native_client/src/trusted/desc/nrd_all_modules.h" | 9 #include "native_client/src/trusted/desc/nrd_all_modules.h" |
10 | 10 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 | 63 |
64 #if NACL_WINDOWS | 64 #if NACL_WINDOWS |
65 NaClSetBrokerDuplicateHandleFunc(private_interface_->BrokerDuplicateHandle); | 65 NaClSetBrokerDuplicateHandleFunc(private_interface_->BrokerDuplicateHandle); |
66 #endif | 66 #endif |
67 | 67 |
68 init_was_successful_ = true; | 68 init_was_successful_ = true; |
69 return true; | 69 return true; |
70 } | 70 } |
71 | 71 |
72 virtual pp::Instance* CreateInstance(PP_Instance pp_instance) { | 72 virtual pp::Instance* CreateInstance(PP_Instance pp_instance) { |
73 MODULE_PRINTF(("ModulePpapi::CreateInstance (pp_instance=%"NACL_PRId32")\n", | 73 MODULE_PRINTF(("ModulePpapi::CreateInstance (pp_instance=%" NACL_PRId32 |
| 74 ")\n", |
74 pp_instance)); | 75 pp_instance)); |
75 Plugin* plugin = Plugin::New(pp_instance); | 76 Plugin* plugin = Plugin::New(pp_instance); |
76 MODULE_PRINTF(("ModulePpapi::CreateInstance (return %p)\n", | 77 MODULE_PRINTF(("ModulePpapi::CreateInstance (return %p)\n", |
77 static_cast<void* >(plugin))); | 78 static_cast<void* >(plugin))); |
78 return plugin; | 79 return plugin; |
79 } | 80 } |
80 | 81 |
81 private: | 82 private: |
82 bool init_was_successful_; | 83 bool init_was_successful_; |
83 const PPB_NaCl_Private* private_interface_; | 84 const PPB_NaCl_Private* private_interface_; |
84 }; | 85 }; |
85 | 86 |
86 } // namespace plugin | 87 } // namespace plugin |
87 | 88 |
88 | 89 |
89 namespace pp { | 90 namespace pp { |
90 | 91 |
91 Module* CreateModule() { | 92 Module* CreateModule() { |
92 MODULE_PRINTF(("CreateModule ()\n")); | 93 MODULE_PRINTF(("CreateModule ()\n")); |
93 return new plugin::ModulePpapi(); | 94 return new plugin::ModulePpapi(); |
94 } | 95 } |
95 | 96 |
96 } // namespace pp | 97 } // namespace pp |
OLD | NEW |