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

Side by Side Diff: components/nacl/renderer/plugin/utility.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) 2011 The Chromium Authors. All rights reserved. 2 * Copyright (c) 2011 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 <stdarg.h> 7 #include <stdarg.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
11 #include "components/nacl/renderer/plugin/utility.h"
11 #include "native_client/src/include/portability_io.h" 12 #include "native_client/src/include/portability_io.h"
12 #include "native_client/src/include/portability_process.h" 13 #include "native_client/src/include/portability_process.h"
13 #include "native_client/src/shared/platform/nacl_check.h" 14 #include "native_client/src/shared/platform/nacl_check.h"
14 #include "ppapi/cpp/module.h" 15 #include "ppapi/cpp/module.h"
15 #include "ppapi/native_client/src/trusted/plugin/utility.h"
16 16
17 namespace plugin { 17 namespace plugin {
18 18
19 int gNaClPluginDebugPrintEnabled = -1; 19 int gNaClPluginDebugPrintEnabled = -1;
20 20
21 /* 21 /*
22 * Prints formatted message to the log. 22 * Prints formatted message to the log.
23 */ 23 */
24 int NaClPluginPrintLog(const char *format, ...) { 24 int NaClPluginPrintLog(const char *format, ...) {
25 va_list arg; 25 va_list arg;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 CloseHandle(reinterpret_cast<HANDLE>(file_desc)); 141 CloseHandle(reinterpret_cast<HANDLE>(file_desc));
142 return -1; 142 return -1;
143 } 143 }
144 return posix_desc; 144 return posix_desc;
145 #else 145 #else
146 return handle; 146 return handle;
147 #endif 147 #endif
148 } 148 }
149 149
150 } // namespace plugin 150 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698