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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 322403005: Pepper: Remove nacl_entry_points.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
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/native_client/src/trusted/plugin/plugin.h" 5 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
6 6
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "native_client/src/include/nacl_base.h" 12 #include "native_client/src/include/nacl_base.h"
13 #include "native_client/src/include/nacl_macros.h" 13 #include "native_client/src/include/nacl_macros.h"
14 #include "native_client/src/include/nacl_scoped_ptr.h" 14 #include "native_client/src/include/nacl_scoped_ptr.h"
15 #include "native_client/src/include/nacl_string.h" 15 #include "native_client/src/include/nacl_string.h"
16 #include "native_client/src/include/portability.h" 16 #include "native_client/src/include/portability.h"
17 #include "native_client/src/include/portability_io.h" 17 #include "native_client/src/include/portability_io.h"
18 #include "native_client/src/include/portability_string.h" 18 #include "native_client/src/include/portability_string.h"
19 #include "native_client/src/public/nacl_file_info.h" 19 #include "native_client/src/public/nacl_file_info.h"
20 #include "native_client/src/shared/platform/nacl_check.h" 20 #include "native_client/src/shared/platform/nacl_check.h"
21 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" 21 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
22 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" 22 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
23 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" 23 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
24 24
25 #include "ppapi/c/pp_errors.h" 25 #include "ppapi/c/pp_errors.h"
26 #include "ppapi/c/private/ppb_nacl_private.h" 26 #include "ppapi/c/private/ppb_nacl_private.h"
27 #include "ppapi/cpp/dev/url_util_dev.h" 27 #include "ppapi/cpp/dev/url_util_dev.h"
28 #include "ppapi/cpp/module.h" 28 #include "ppapi/cpp/module.h"
29 29
30 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
31 #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h" 30 #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h"
32 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" 31 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
33 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" 32 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
34 #include "ppapi/native_client/src/trusted/plugin/utility.h" 33 #include "ppapi/native_client/src/trusted/plugin/utility.h"
35 34
36 namespace plugin { 35 namespace plugin {
37 36
38 namespace { 37 namespace {
39 38
40 // Up to 20 seconds 39 // Up to 20 seconds
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 524
526 void Plugin::SetExitStatusOnMainThread(int32_t pp_error, 525 void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
527 int exit_status) { 526 int exit_status) {
528 DCHECK(pp::Module::Get()->core()->IsMainThread()); 527 DCHECK(pp::Module::Get()->core()->IsMainThread());
529 DCHECK(nacl_interface_); 528 DCHECK(nacl_interface_);
530 nacl_interface_->SetExitStatus(pp_instance(), exit_status); 529 nacl_interface_->SetExitStatus(pp_instance(), exit_status);
531 } 530 }
532 531
533 532
534 } // namespace plugin 533 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698