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

Side by Side Diff: components/nacl/loader/nonsfi/nonsfi_main.cc

Issue 1244533006: NaCl cleanup: Split out irt_interfaces.cc from irt_ppapi.cc (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | ppapi/nacl_irt/irt_interfaces.h » ('j') | ppapi/nacl_irt/irt_interfaces.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/nacl/loader/nonsfi/nonsfi_main.h" 5 #include "components/nacl/loader/nonsfi/nonsfi_main.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "native_client/src/include/elf_auxv.h" 10 #include "native_client/src/include/elf_auxv.h"
11 11
12 #if defined(OS_NACL_NONSFI) 12 #if defined(OS_NACL_NONSFI)
13 #include "native_client/src/public/nonsfi/elf_loader.h" 13 #include "native_client/src/public/nonsfi/elf_loader.h"
14 #include "ppapi/nacl_irt/irt_ppapi.h" 14 #include "ppapi/nacl_irt/irt_interfaces.h"
15 #else 15 #else
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "components/nacl/loader/nonsfi/elf_loader.h" 17 #include "components/nacl/loader/nonsfi/elf_loader.h"
18 #include "components/nacl/loader/nonsfi/irt_interfaces.h" 18 #include "components/nacl/loader/nonsfi/irt_interfaces.h"
19 #include "native_client/src/include/nacl_macros.h" 19 #include "native_client/src/include/nacl_macros.h"
20 #include "native_client/src/public/nacl_desc.h" 20 #include "native_client/src/public/nacl_desc.h"
21 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" 21 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
22 #endif 22 #endif
23 23
24 namespace nacl { 24 namespace nacl {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #endif 99 #endif
100 if (!base::PlatformThread::CreateNonJoinable( 100 if (!base::PlatformThread::CreateNonJoinable(
101 kStackSize, new PluginMainDelegate(entry_point))) { 101 kStackSize, new PluginMainDelegate(entry_point))) {
102 LOG(ERROR) << "LoadModuleRpc: Failed to create plugin main thread."; 102 LOG(ERROR) << "LoadModuleRpc: Failed to create plugin main thread.";
103 return; 103 return;
104 } 104 }
105 } 105 }
106 106
107 } // namespace nonsfi 107 } // namespace nonsfi
108 } // namespace nacl 108 } // namespace nacl
OLDNEW
« no previous file with comments | « no previous file | ppapi/nacl_irt/irt_interfaces.h » ('j') | ppapi/nacl_irt/irt_interfaces.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698