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

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

Issue 397243004: Pepper: Remove trusted plugin loadable module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // File name of the internal PDF plugin on different platforms. 52 // File name of the internal PDF plugin on different platforms.
53 const base::FilePath::CharType kInternalPDFPluginFileName[] = 53 const base::FilePath::CharType kInternalPDFPluginFileName[] =
54 #if defined(OS_WIN) 54 #if defined(OS_WIN)
55 FILE_PATH_LITERAL("pdf.dll"); 55 FILE_PATH_LITERAL("pdf.dll");
56 #elif defined(OS_MACOSX) 56 #elif defined(OS_MACOSX)
57 FILE_PATH_LITERAL("PDF.plugin"); 57 FILE_PATH_LITERAL("PDF.plugin");
58 #else // Linux and Chrome OS 58 #else // Linux and Chrome OS
59 FILE_PATH_LITERAL("libpdf.so"); 59 FILE_PATH_LITERAL("libpdf.so");
60 #endif 60 #endif
61 61
62 // File name of the internal NaCl plugin on different platforms. 62 // Historical file name of the internal NaCl plugin on different platforms.
63 // TODO(teravest): See if we can change the strings here to not be an explicit
64 // filename. I've left this as the historical value in case disabled-plugin
65 // information is stored relative to file path.
dmichael (off chromium) 2014/07/18 18:08:37 Hmm, chromoting seems to use a special string: int
teravest 2014/07/28 18:40:08 Done.
63 const base::FilePath::CharType kInternalNaClPluginFileName[] = 66 const base::FilePath::CharType kInternalNaClPluginFileName[] =
64 #if defined(OS_WIN) 67 #if defined(OS_WIN)
65 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll"); 68 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll");
66 #elif defined(OS_MACOSX) 69 #elif defined(OS_MACOSX)
67 // TODO(noelallen) Please verify this extention name is correct. 70 // TODO(noelallen) Please verify this extention name is correct.
68 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin"); 71 FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin");
69 #else // Linux and Chrome OS 72 #else // Linux and Chrome OS
70 FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so"); 73 FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
71 #endif 74 #endif
72 75
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 599
597 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) { 600 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
598 g_invalid_specified_user_data_dir.Get() = user_data_dir; 601 g_invalid_specified_user_data_dir.Get() = user_data_dir;
599 } 602 }
600 603
601 const base::FilePath& GetInvalidSpecifiedUserDataDir() { 604 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
602 return g_invalid_specified_user_data_dir.Get(); 605 return g_invalid_specified_user_data_dir.Get();
603 } 606 }
604 607
605 } // namespace chrome 608 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698