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

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

Issue 292213002: Change to using nacl_file_info.h from src/public instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: might as well use helper to check Created 6 years, 7 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
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime" 7 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
8 8
9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" 9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
10 10
(...skipping 16 matching lines...) Expand all
27 #include "native_client/src/shared/platform/nacl_sync_checked.h" 27 #include "native_client/src/shared/platform/nacl_sync_checked.h"
28 #include "native_client/src/shared/platform/nacl_sync_raii.h" 28 #include "native_client/src/shared/platform/nacl_sync_raii.h"
29 #include "native_client/src/shared/platform/scoped_ptr_refcount.h" 29 #include "native_client/src/shared/platform/scoped_ptr_refcount.h"
30 #include "native_client/src/trusted/desc/nacl_desc_imc.h" 30 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
31 // remove when we no longer need to cast the DescWrapper below. 31 // remove when we no longer need to cast the DescWrapper below.
32 #include "native_client/src/trusted/desc/nacl_desc_io.h" 32 #include "native_client/src/trusted/desc/nacl_desc_io.h"
33 #include "native_client/src/trusted/desc/nrd_xfer.h" 33 #include "native_client/src/trusted/desc/nrd_xfer.h"
34 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" 34 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
35 35
36 #include "native_client/src/public/imc_types.h" 36 #include "native_client/src/public/imc_types.h"
37 #include "native_client/src/public/nacl_file_info.h"
37 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" 38 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
38 #include "native_client/src/trusted/validator/nacl_file_info.h"
39 39
40 #include "ppapi/c/pp_errors.h" 40 #include "ppapi/c/pp_errors.h"
41 #include "ppapi/cpp/core.h" 41 #include "ppapi/cpp/core.h"
42 #include "ppapi/cpp/completion_callback.h" 42 #include "ppapi/cpp/completion_callback.h"
43 43
44 #include "ppapi/native_client/src/trusted/plugin/plugin.h" 44 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
45 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" 45 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
46 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" 46 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h"
47 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" 47 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
48 #include "ppapi/native_client/src/trusted/plugin/srpc_client.h" 48 #include "ppapi/native_client/src/trusted/plugin/srpc_client.h"
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 835
836 nacl::string ServiceRuntime::GetCrashLogOutput() { 836 nacl::string ServiceRuntime::GetCrashLogOutput() {
837 if (NULL != subprocess_.get()) { 837 if (NULL != subprocess_.get()) {
838 return subprocess_->GetCrashLogOutput(); 838 return subprocess_->GetCrashLogOutput();
839 } else { 839 } else {
840 return std::string(); 840 return std::string();
841 } 841 }
842 } 842 }
843 843
844 } // namespace plugin 844 } // namespace plugin
OLDNEW
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698