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

Unified Diff: chrome/common/chrome_paths.cc

Issue 7604023: Deploy win flapper via component updater (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
===================================================================
--- chrome/common/chrome_paths.cc (revision 96104)
+++ chrome/common/chrome_paths.cc (working copy)
@@ -31,20 +31,6 @@
FILE_PATH_LITERAL("libgcflashplayer.so");
#endif
-// File name of the pepper Flash plugin on different platforms.
-const FilePath::CharType kPepperFlashPluginFileName[] =
-#if defined(OS_MACOSX)
- FILE_PATH_LITERAL("PepperFlashPlayer.plugin");
-#elif defined(OS_WIN)
- FILE_PATH_LITERAL("pepflashplayer.dll");
-#else // OS_LINUX, etc.
- FILE_PATH_LITERAL("libpepflashplayer.so");
-#endif
-
-// The pepper flash plugins are in a directory with this name.
-const FilePath::CharType kPepperFlashBaseDirectory[] =
- FILE_PATH_LITERAL("PepperFlash");
-
// File name of the internal PDF plugin on different platforms.
const FilePath::CharType kInternalPDFPluginFileName[] =
#if defined(OS_WIN)
@@ -88,30 +74,6 @@
return PathService::Get(base::DIR_MODULE, result);
}
-// Pepper flash plugins have the version encoded in the path itself
-// so we need to enumerate the directories to find the full path
-bool GetPepperFlashDirectory(FilePath* result) {
- if (!GetInternalPluginsDirectory(result))
- return false;
- *result = result->Append(kPepperFlashBaseDirectory);
- Version latest("0.0");
- bool found = false;
- file_util::FileEnumerator
- file_enumerator(*result, false, file_util::FileEnumerator::DIRECTORIES);
- for (FilePath path = file_enumerator.Next(); !path.value().empty();
- path = file_enumerator.Next()) {
- Version version(path.BaseName().MaybeAsASCII());
- if (!version.IsValid())
- continue;
- if (version.CompareTo(latest) > 0) {
- latest = version;
- *result = path;
- found = true;
- }
- }
- return found;
-}
-
bool PathProvider(int key, FilePath* result) {
// Some keys are just aliases...
switch (key) {
@@ -260,11 +222,7 @@
return false;
break;
case chrome::FILE_PEPPER_FLASH_PLUGIN:
- if (!GetPepperFlashDirectory(&cur))
return false;
- cur = cur.Append(kPepperFlashPluginFileName);
- if (!file_util::PathExists(cur))
- return false;
break;
case chrome::FILE_PDF_PLUGIN:
if (!GetInternalPluginsDirectory(&cur))
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698