| 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/common/chrome_paths.h" | 5 #include "chrome/common/chrome_paths.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 case chrome::FILE_PDF_PLUGIN: | 245 case chrome::FILE_PDF_PLUGIN: |
| 246 if (!GetInternalPluginsDirectory(&cur)) | 246 if (!GetInternalPluginsDirectory(&cur)) |
| 247 return false; | 247 return false; |
| 248 cur = cur.Append(kInternalPDFPluginFileName); | 248 cur = cur.Append(kInternalPDFPluginFileName); |
| 249 break; | 249 break; |
| 250 case chrome::FILE_NACL_PLUGIN: | 250 case chrome::FILE_NACL_PLUGIN: |
| 251 if (!GetInternalPluginsDirectory(&cur)) | 251 if (!GetInternalPluginsDirectory(&cur)) |
| 252 return false; | 252 return false; |
| 253 cur = cur.Append(kInternalNaClPluginFileName); | 253 cur = cur.Append(kInternalNaClPluginFileName); |
| 254 break; | 254 break; |
| 255 case chrome::FILE_PNACL_COMPONENT: |
| 256 // TODO(jvoung): Do we want a default value or just the ability to |
| 257 // override immediately when testing on bots to avoid race conditions? |
| 258 return false; |
| 255 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 259 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 256 case chrome::FILE_NACL_HELPER: | 260 case chrome::FILE_NACL_HELPER: |
| 257 if (!PathService::Get(base::DIR_MODULE, &cur)) | 261 if (!PathService::Get(base::DIR_MODULE, &cur)) |
| 258 return false; | 262 return false; |
| 259 cur = cur.Append(kInternalNaClHelperFileName); | 263 cur = cur.Append(kInternalNaClHelperFileName); |
| 260 break; | 264 break; |
| 261 case chrome::FILE_NACL_HELPER_BOOTSTRAP: | 265 case chrome::FILE_NACL_HELPER_BOOTSTRAP: |
| 262 if (!PathService::Get(base::DIR_MODULE, &cur)) | 266 if (!PathService::Get(base::DIR_MODULE, &cur)) |
| 263 return false; | 267 return false; |
| 264 cur = cur.Append(kInternalNaClHelperBootstrapFileName); | 268 cur = cur.Append(kInternalNaClHelperBootstrapFileName); |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 return true; | 430 return true; |
| 427 } | 431 } |
| 428 | 432 |
| 429 // This cannot be done as a static initializer sadly since Visual Studio will | 433 // This cannot be done as a static initializer sadly since Visual Studio will |
| 430 // eliminate this object file if there is no direct entry point into it. | 434 // eliminate this object file if there is no direct entry point into it. |
| 431 void RegisterPathProvider() { | 435 void RegisterPathProvider() { |
| 432 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 436 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
| 433 } | 437 } |
| 434 | 438 |
| 435 } // namespace chrome | 439 } // namespace chrome |
| OLD | NEW |