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

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

Issue 903333002: NaCl cleanup: Remove references to native_client/src/public/nacl_file_info.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Cleanup 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 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime" 7 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
8 8
9 #include "components/nacl/renderer/plugin/service_runtime.h" 9 #include "components/nacl/renderer/plugin/service_runtime.h"
10 10
11 #include <string.h> 11 #include <string.h>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 14
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "components/nacl/renderer/plugin/plugin.h" 16 #include "components/nacl/renderer/plugin/plugin.h"
17 #include "components/nacl/renderer/plugin/plugin_error.h" 17 #include "components/nacl/renderer/plugin/plugin_error.h"
18 #include "components/nacl/renderer/plugin/pnacl_resources.h" 18 #include "components/nacl/renderer/plugin/pnacl_resources.h"
19 #include "components/nacl/renderer/plugin/sel_ldr_launcher_chrome.h" 19 #include "components/nacl/renderer/plugin/sel_ldr_launcher_chrome.h"
20 #include "components/nacl/renderer/plugin/srpc_client.h" 20 #include "components/nacl/renderer/plugin/srpc_client.h"
21 #include "components/nacl/renderer/plugin/utility.h" 21 #include "components/nacl/renderer/plugin/utility.h"
22 #include "native_client/src/include/nacl_macros.h" 22 #include "native_client/src/include/nacl_macros.h"
23 #include "native_client/src/include/nacl_scoped_ptr.h" 23 #include "native_client/src/include/nacl_scoped_ptr.h"
24 #include "native_client/src/include/portability_io.h" 24 #include "native_client/src/include/portability_io.h"
25 #include "native_client/src/include/portability_string.h" 25 #include "native_client/src/include/portability_string.h"
26 #include "native_client/src/public/imc_types.h" 26 #include "native_client/src/public/imc_types.h"
27 #include "native_client/src/public/nacl_file_info.h"
28 #include "native_client/src/shared/platform/nacl_check.h" 27 #include "native_client/src/shared/platform/nacl_check.h"
29 #include "native_client/src/shared/platform/nacl_log.h" 28 #include "native_client/src/shared/platform/nacl_log.h"
30 #include "native_client/src/shared/platform/nacl_sync.h" 29 #include "native_client/src/shared/platform/nacl_sync.h"
31 #include "native_client/src/shared/platform/nacl_sync_checked.h" 30 #include "native_client/src/shared/platform/nacl_sync_checked.h"
32 #include "native_client/src/shared/platform/nacl_sync_raii.h" 31 #include "native_client/src/shared/platform/nacl_sync_raii.h"
33 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" 32 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
34 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" 33 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
35 #include "ppapi/c/pp_errors.h" 34 #include "ppapi/c/pp_errors.h"
36 #include "ppapi/cpp/completion_callback.h" 35 #include "ppapi/cpp/completion_callback.h"
37 #include "ppapi/cpp/core.h" 36 #include "ppapi/cpp/core.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 NaClLog(4, "ServiceRuntime::~ServiceRuntime (this=%p)\n", 291 NaClLog(4, "ServiceRuntime::~ServiceRuntime (this=%p)\n",
293 static_cast<void*>(this)); 292 static_cast<void*>(this));
294 // We do this just in case Shutdown() was not called. 293 // We do this just in case Shutdown() was not called.
295 subprocess_.reset(NULL); 294 subprocess_.reset(NULL);
296 295
297 NaClCondVarDtor(&cond_); 296 NaClCondVarDtor(&cond_);
298 NaClMutexDtor(&mu_); 297 NaClMutexDtor(&mu_);
299 } 298 }
300 299
301 } // namespace plugin 300 } // namespace plugin
OLDNEW
« no previous file with comments | « components/nacl/renderer/plugin/service_runtime.h ('k') | ppapi/api/private/ppb_nacl_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698