| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/nacl/common/nacl_paths.h" | 5 #include "components/nacl/common/nacl_paths.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "build/build_config.h" |
| 10 #include "components/nacl/common/nacl_switches.h" | 11 #include "components/nacl/common/nacl_switches.h" |
| 11 | 12 |
| 12 namespace { | 13 namespace { |
| 13 | 14 |
| 14 #if defined(OS_LINUX) | 15 #if defined(OS_LINUX) |
| 15 // File name of the nacl_helper and nacl_helper_bootstrap, Linux only. | 16 // File name of the nacl_helper and nacl_helper_bootstrap, Linux only. |
| 16 const base::FilePath::CharType kInternalNaClHelperFileName[] = | 17 const base::FilePath::CharType kInternalNaClHelperFileName[] = |
| 17 FILE_PATH_LITERAL("nacl_helper"); | 18 FILE_PATH_LITERAL("nacl_helper"); |
| 18 const base::FilePath::CharType kInternalNaClHelperNonSfiFileName[] = | 19 const base::FilePath::CharType kInternalNaClHelperNonSfiFileName[] = |
| 19 FILE_PATH_LITERAL("nacl_helper_nonsfi"); | 20 FILE_PATH_LITERAL("nacl_helper_nonsfi"); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 49 } | 50 } |
| 50 } | 51 } |
| 51 | 52 |
| 52 // This cannot be done as a static initializer sadly since Visual Studio will | 53 // This cannot be done as a static initializer sadly since Visual Studio will |
| 53 // eliminate this object file if there is no direct entry point into it. | 54 // eliminate this object file if there is no direct entry point into it. |
| 54 void RegisterPathProvider() { | 55 void RegisterPathProvider() { |
| 55 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 56 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
| 56 } | 57 } |
| 57 | 58 |
| 58 } // namespace nacl | 59 } // namespace nacl |
| OLD | NEW |