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

Side by Side Diff: chrome/nacl/nacl_main_platform_delegate_win.cc

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/nacl/nacl_exe_win_64.cc ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_main_platform_delegate.h" 5 #include "chrome/nacl/nacl_main_platform_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/native_library.h" 10 #include "base/native_library.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "sandbox/src/sandbox.h" 12 #include "sandbox/win/src/sandbox.h"
13 13
14 NaClMainPlatformDelegate::NaClMainPlatformDelegate( 14 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
15 const content::MainFunctionParams& parameters) 15 const content::MainFunctionParams& parameters)
16 : parameters_(parameters), sandbox_test_module_(NULL) { 16 : parameters_(parameters), sandbox_test_module_(NULL) {
17 } 17 }
18 18
19 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { 19 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
20 } 20 }
21 21
22 void NaClMainPlatformDelegate::PlatformInitialize() { 22 void NaClMainPlatformDelegate::PlatformInitialize() {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 result = (*run_security_tests)(); 85 result = (*run_security_tests)();
86 } else { 86 } else {
87 VLOG(1) << "Failed to get NaCl sandbox test function"; 87 VLOG(1) << "Failed to get NaCl sandbox test function";
88 result = false; 88 result = false;
89 } 89 }
90 base::UnloadNativeLibrary(sandbox_test_module_); 90 base::UnloadNativeLibrary(sandbox_test_module_);
91 sandbox_test_module_ = NULL; 91 sandbox_test_module_ = NULL;
92 } 92 }
93 return result; 93 return result;
94 } 94 }
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_exe_win_64.cc ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698