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_secure_random.h" | 8 #include "native_client/src/shared/platform/nacl_secure_random.h" |
9 #include "native_client/src/shared/platform/nacl_time.h" | 9 #include "native_client/src/shared/platform/nacl_time.h" |
10 #include "native_client/src/trusted/desc/nrd_all_modules.h" | 10 #include "native_client/src/trusted/desc/nrd_all_modules.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 #endif | 65 #endif |
66 | 66 |
67 init_was_successful_ = true; | 67 init_was_successful_ = true; |
68 return true; | 68 return true; |
69 } | 69 } |
70 | 70 |
71 pp::Instance* ModulePpapi::CreateInstance(PP_Instance pp_instance) { | 71 pp::Instance* ModulePpapi::CreateInstance(PP_Instance pp_instance) { |
72 MODULE_PRINTF(("ModulePpapi::CreateInstance (pp_instance=%" NACL_PRId32 | 72 MODULE_PRINTF(("ModulePpapi::CreateInstance (pp_instance=%" NACL_PRId32 |
73 ")\n", | 73 ")\n", |
74 pp_instance)); | 74 pp_instance)); |
75 Plugin* plugin = Plugin::New(pp_instance); | 75 Plugin* plugin = new Plugin(pp_instance); |
76 MODULE_PRINTF(("ModulePpapi::CreateInstance (return %p)\n", | 76 MODULE_PRINTF(("ModulePpapi::CreateInstance (return %p)\n", |
77 static_cast<void* >(plugin))); | 77 static_cast<void* >(plugin))); |
78 return plugin; | 78 return plugin; |
79 } | 79 } |
80 | 80 |
81 } // namespace plugin | 81 } // namespace plugin |
82 | 82 |
83 | 83 |
84 namespace pp { | 84 namespace pp { |
85 | 85 |
86 Module* CreateModule() { | 86 Module* CreateModule() { |
87 MODULE_PRINTF(("CreateModule ()\n")); | 87 MODULE_PRINTF(("CreateModule ()\n")); |
88 return new plugin::ModulePpapi(); | 88 return new plugin::ModulePpapi(); |
89 } | 89 } |
90 | 90 |
91 } // namespace pp | 91 } // namespace pp |
OLD | NEW |