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

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

Issue 24616002: Clean up a few unused globals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win Created 7 years, 2 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
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 const base::FilePath::CharType kInternalNaClPluginFileName[] = 57 const base::FilePath::CharType kInternalNaClPluginFileName[] =
58 #if defined(OS_WIN) 58 #if defined(OS_WIN)
59 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll"); 59 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll");
60 #elif defined(OS_MACOSX) 60 #elif defined(OS_MACOSX)
61 // TODO(noelallen) Please verify this extention name is correct. 61 // TODO(noelallen) Please verify this extention name is correct.
62 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin"); 62 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin");
63 #else // Linux and Chrome OS 63 #else // Linux and Chrome OS
64 FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so"); 64 FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
65 #endif 65 #endif
66 66
67 const base::FilePath::CharType kEffectsPluginFileName[] =
Lei Zhang 2013/09/25 19:13:10 +vrk: Is this going x-platform soon or can we proc
Nico 2013/09/25 19:28:30 If it is, it can be reintroduced then, no? I'd lik
68 #if defined(OS_WIN)
69 FILE_PATH_LITERAL("pepper/libppeffects.dll");
70 #elif defined(OS_MACOSX)
71 FILE_PATH_LITERAL("pepper/libppeffects.plugin");
72 #else // Linux and Chrome OS
73 FILE_PATH_LITERAL("pepper/libppeffects.so");
74 #endif
75
76 #if defined(OS_POSIX) && !defined(OS_MACOSX) 67 #if defined(OS_POSIX) && !defined(OS_MACOSX)
77 68
69 const base::FilePath::CharType kEffectsPluginFileName[] =
70 FILE_PATH_LITERAL("pepper/libppeffects.so");
71
78 const base::FilePath::CharType kO3DPluginFileName[] = 72 const base::FilePath::CharType kO3DPluginFileName[] =
79 FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so"); 73 FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so");
80 74
81 const base::FilePath::CharType kO1DPluginFileName[] = 75 const base::FilePath::CharType kO1DPluginFileName[] =
82 FILE_PATH_LITERAL("pepper/libppo1d.so"); 76 FILE_PATH_LITERAL("pepper/libppo1d.so");
83 77
84 const base::FilePath::CharType kGTalkPluginFileName[] = 78 const base::FilePath::CharType kGTalkPluginFileName[] =
85 FILE_PATH_LITERAL("pepper/libppgoogletalk.so"); 79 FILE_PATH_LITERAL("pepper/libppgoogletalk.so");
86 80
87 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 81 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 return true; 519 return true;
526 } 520 }
527 521
528 // This cannot be done as a static initializer sadly since Visual Studio will 522 // This cannot be done as a static initializer sadly since Visual Studio will
529 // eliminate this object file if there is no direct entry point into it. 523 // eliminate this object file if there is no direct entry point into it.
530 void RegisterPathProvider() { 524 void RegisterPathProvider() {
531 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 525 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
532 } 526 }
533 527
534 } // namespace chrome 528 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698