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

Side by Side Diff: chrome/nacl/nacl_main_platform_delegate_mac.mm

Issue 10512016: Get rid of internal content includes for sandbox code from chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: update deps! Created 8 years, 6 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_broker_listener.cc ('k') | chrome/service/service_main.cc » ('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 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/native_library.h" 11 #include "base/native_library.h"
12 #include "chrome/common/chrome_sandbox_type_mac.h" 12 #include "chrome/common/chrome_sandbox_type_mac.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "content/common/sandbox_mac.h"
15 #include "content/public/common/sandbox_init.h" 14 #include "content/public/common/sandbox_init.h"
16 15
17 NaClMainPlatformDelegate::NaClMainPlatformDelegate( 16 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
18 const content::MainFunctionParams& parameters) 17 const content::MainFunctionParams& parameters)
19 : parameters_(parameters), sandbox_test_module_(NULL) { 18 : parameters_(parameters), sandbox_test_module_(NULL) {
20 } 19 }
21 20
22 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { 21 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
23 } 22 }
24 23
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 result = (*run_security_tests)(); 72 result = (*run_security_tests)();
74 } else { 73 } else {
75 VLOG(1) << "Failed to get NaCl sandbox test function"; 74 VLOG(1) << "Failed to get NaCl sandbox test function";
76 result = false; 75 result = false;
77 } 76 }
78 base::UnloadNativeLibrary(sandbox_test_module_); 77 base::UnloadNativeLibrary(sandbox_test_module_);
79 sandbox_test_module_ = NULL; 78 sandbox_test_module_ = NULL;
80 } 79 }
81 return result; 80 return result;
82 } 81 }
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_broker_listener.cc ('k') | chrome/service/service_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698