Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: components/nacl/renderer/plugin/module_ppapi.cc

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update #include guards Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "components/nacl/renderer/plugin/module_ppapi.h"
8 #include "components/nacl/renderer/plugin/plugin.h"
9 #include "components/nacl/renderer/plugin/utility.h"
7 #include "native_client/src/shared/imc/nacl_imc_c.h" 10 #include "native_client/src/shared/imc/nacl_imc_c.h"
8 #include "native_client/src/shared/platform/nacl_secure_random.h" 11 #include "native_client/src/shared/platform/nacl_secure_random.h"
9 #include "native_client/src/shared/platform/nacl_time.h" 12 #include "native_client/src/shared/platform/nacl_time.h"
10 #include "native_client/src/trusted/desc/nrd_all_modules.h" 13 #include "native_client/src/trusted/desc/nrd_all_modules.h"
11 14
12 #include "ppapi/native_client/src/trusted/plugin/module_ppapi.h"
13 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
14 #include "ppapi/native_client/src/trusted/plugin/utility.h"
15
16 namespace plugin { 15 namespace plugin {
17 16
18 ModulePpapi::ModulePpapi() : pp::Module(), 17 ModulePpapi::ModulePpapi() : pp::Module(),
19 init_was_successful_(false), 18 init_was_successful_(false),
20 private_interface_(NULL) { 19 private_interface_(NULL) {
21 MODULE_PRINTF(("ModulePpapi::ModulePpapi (this=%p)\n", 20 MODULE_PRINTF(("ModulePpapi::ModulePpapi (this=%p)\n",
22 static_cast<void*>(this))); 21 static_cast<void*>(this)));
23 } 22 }
24 23
25 ModulePpapi::~ModulePpapi() { 24 ModulePpapi::~ModulePpapi() {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 77
79 78
80 namespace pp { 79 namespace pp {
81 80
82 Module* CreateModule() { 81 Module* CreateModule() {
83 MODULE_PRINTF(("CreateModule ()\n")); 82 MODULE_PRINTF(("CreateModule ()\n"));
84 return new plugin::ModulePpapi(); 83 return new plugin::ModulePpapi();
85 } 84 }
86 85
87 } // namespace pp 86 } // namespace pp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698