| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/nacl/nacl_launcher_thread.h" | 5 #include "chrome/nacl/nacl_launcher_thread.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/atomicops.h" | 9 #include "base/atomicops.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 NaClSetIrtFileDesc(irt_desc); | 122 NaClSetIrtFileDesc(irt_desc); |
| 123 } | 123 } |
| 124 | 124 |
| 125 scoped_array<NaClHandle> array(new NaClHandle[handles.size()]); | 125 scoped_array<NaClHandle> array(new NaClHandle[handles.size()]); |
| 126 for (size_t i = 0; i < handles.size(); i++) { | 126 for (size_t i = 0; i < handles.size(); i++) { |
| 127 array[i] = nacl::ToNativeHandle(handles[i]); | 127 array[i] = nacl::ToNativeHandle(handles[i]); |
| 128 } | 128 } |
| 129 NaClMainForChromium(static_cast<int>(handles.size()), array.get(), | 129 NaClMainForChromium(static_cast<int>(handles.size()), array.get(), |
| 130 debug_enabled_); | 130 debug_enabled_); |
| 131 } | 131 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 7230057:
Revert 90805 - I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/