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

Side by Side Diff: chrome/common/chrome_paths.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows build fix Created 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll"); 58 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll");
59 #elif defined(OS_MACOSX) 59 #elif defined(OS_MACOSX)
60 // TODO(noelallen) Please verify this extention name is correct. 60 // TODO(noelallen) Please verify this extention name is correct.
61 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin"); 61 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin");
62 #else // Linux and Chrome OS 62 #else // Linux and Chrome OS
63 FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so"); 63 FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
64 #endif 64 #endif
65 65
66 #if defined(OS_POSIX) && !defined(OS_MACOSX) 66 #if defined(OS_POSIX) && !defined(OS_MACOSX)
67 // File name of the nacl_helper and nacl_helper_bootstrap, Linux only.
68 const base::FilePath::CharType kInternalNaClHelperFileName[] =
69 FILE_PATH_LITERAL("nacl_helper");
70 const base::FilePath::CharType kInternalNaClHelperBootstrapFileName[] =
71 FILE_PATH_LITERAL("nacl_helper_bootstrap");
72 #endif
73
74
75 #if defined(OS_POSIX) && !defined(OS_MACOSX)
76 67
77 const base::FilePath::CharType kO3DPluginFileName[] = 68 const base::FilePath::CharType kO3DPluginFileName[] =
78 FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so"); 69 FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so");
79 70
80 const base::FilePath::CharType kO1DPluginFileName[] = 71 const base::FilePath::CharType kO1DPluginFileName[] =
81 FILE_PATH_LITERAL("pepper/libppo1d.so"); 72 FILE_PATH_LITERAL("pepper/libppo1d.so");
82 73
83 const base::FilePath::CharType kGTalkPluginFileName[] = 74 const base::FilePath::CharType kGTalkPluginFileName[] =
84 FILE_PATH_LITERAL("pepper/libppgoogletalk.so"); 75 FILE_PATH_LITERAL("pepper/libppgoogletalk.so");
85 76
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 cur = cur.DirName(); 312 cur = cur.DirName();
322 cur = cur.DirName(); 313 cur = cur.DirName();
323 } 314 }
324 #else 315 #else
325 if (!GetInternalPluginsDirectory(&cur)) 316 if (!GetInternalPluginsDirectory(&cur))
326 return false; 317 return false;
327 #endif 318 #endif
328 cur = cur.Append(FILE_PATH_LITERAL("pnacl")); 319 cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
329 break; 320 break;
330 #if defined(OS_POSIX) && !defined(OS_MACOSX) 321 #if defined(OS_POSIX) && !defined(OS_MACOSX)
331 case chrome::FILE_NACL_HELPER:
332 if (!PathService::Get(base::DIR_MODULE, &cur))
333 return false;
334 cur = cur.Append(kInternalNaClHelperFileName);
335 break;
336 case chrome::FILE_NACL_HELPER_BOOTSTRAP:
337 if (!PathService::Get(base::DIR_MODULE, &cur))
338 return false;
339 cur = cur.Append(kInternalNaClHelperBootstrapFileName);
340 break;
341 case chrome::FILE_O3D_PLUGIN: 322 case chrome::FILE_O3D_PLUGIN:
342 if (!PathService::Get(base::DIR_MODULE, &cur)) 323 if (!PathService::Get(base::DIR_MODULE, &cur))
343 return false; 324 return false;
344 cur = cur.Append(kO3DPluginFileName); 325 cur = cur.Append(kO3DPluginFileName);
345 break; 326 break;
346 case chrome::FILE_O1D_PLUGIN: 327 case chrome::FILE_O1D_PLUGIN:
347 if (!PathService::Get(base::DIR_MODULE, &cur)) 328 if (!PathService::Get(base::DIR_MODULE, &cur))
348 return false; 329 return false;
349 cur = cur.Append(kO1DPluginFileName); 330 cur = cur.Append(kO1DPluginFileName);
350 break; 331 break;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 return true; 508 return true;
528 } 509 }
529 510
530 // This cannot be done as a static initializer sadly since Visual Studio will 511 // This cannot be done as a static initializer sadly since Visual Studio will
531 // eliminate this object file if there is no direct entry point into it. 512 // eliminate this object file if there is no direct entry point into it.
532 void RegisterPathProvider() { 513 void RegisterPathProvider() {
533 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 514 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
534 } 515 }
535 516
536 } // namespace chrome 517 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698