| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "base/chrome_application_mac.h" | |
| 9 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 11 #include "base/logging.h" | 10 #include "base/logging.h" |
| 12 #include "base/native_library.h" | 11 #include "base/native_library.h" |
| 13 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/sandbox_mac.h" | 13 #include "chrome/common/sandbox_mac.h" |
| 15 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" | |
| 16 | 14 |
| 17 NaClMainPlatformDelegate::NaClMainPlatformDelegate( | 15 NaClMainPlatformDelegate::NaClMainPlatformDelegate( |
| 18 const MainFunctionParams& parameters) | 16 const MainFunctionParams& parameters) |
| 19 : parameters_(parameters), sandbox_test_module_(NULL) { | 17 : parameters_(parameters), sandbox_test_module_(NULL) { |
| 20 } | 18 } |
| 21 | 19 |
| 22 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { | 20 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() { |
| 23 } | 21 } |
| 24 | 22 |
| 25 // TODO(jvoung): see if this old comment (from renderer_main_platform...) | 23 // TODO(jvoung): see if this old comment (from renderer_main_platform...) |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 result = (*run_security_tests)(); | 76 result = (*run_security_tests)(); |
| 79 } else { | 77 } else { |
| 80 VLOG(1) << "Failed to get NaCl sandbox test function"; | 78 VLOG(1) << "Failed to get NaCl sandbox test function"; |
| 81 result = false; | 79 result = false; |
| 82 } | 80 } |
| 83 base::UnloadNativeLibrary(sandbox_test_module_); | 81 base::UnloadNativeLibrary(sandbox_test_module_); |
| 84 sandbox_test_module_ = NULL; | 82 sandbox_test_module_ = NULL; |
| 85 } | 83 } |
| 86 return result; | 84 return result; |
| 87 } | 85 } |
| OLD | NEW |