Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chromium: Fix plugin_paths patch for version 44.
The pepper effects plugin has been removed and migrated to NaCl, so I'm just dropping the hunk of that patch. Upstream reviow URL: https://codereview.chromium.org/1085393003 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
- Loading branch information
Showing
2 changed files
with
90 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc | ||
index 8a205a6..d5c24e1 100644 | ||
--- a/chrome/common/chrome_paths.cc | ||
+++ b/chrome/common/chrome_paths.cc | ||
@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath> | ||
g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; | ||
|
||
// Gets the path for internal plugins. | ||
-bool GetInternalPluginsDirectory(base::FilePath* result) { | ||
-#if defined(OS_MACOSX) && !defined(OS_IOS) | ||
- // If called from Chrome, get internal plugins from a subdirectory of the | ||
- // framework. | ||
- if (base::mac::AmIBundled()) { | ||
- *result = chrome::GetFrameworkBundlePath(); | ||
- DCHECK(!result->empty()); | ||
- *result = result->Append("Internet Plug-Ins"); | ||
- return true; | ||
- } | ||
- // In tests, just look in the module directory (below). | ||
-#endif | ||
- | ||
- // The rest of the world expects plugins in the module directory. | ||
- return PathService::Get(base::DIR_MODULE, result); | ||
+bool GetInternalPluginsDirectory(base::FilePath* result, | ||
+ const std::string& ident) { | ||
+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; | ||
+ const char* value = getenv(full_env.c_str()); | ||
+ if (value == NULL) | ||
+ return PathService::Get(base::DIR_MODULE, result); | ||
+ else | ||
+ *result = base::FilePath(value); | ||
} | ||
|
||
} // namespace | ||
@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { | ||
create_dir = true; | ||
break; | ||
case chrome::DIR_INTERNAL_PLUGINS: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "ALL")) | ||
return false; | ||
break; | ||
case chrome::DIR_PEPPER_FLASH_PLUGIN: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) | ||
return false; | ||
cur = cur.Append(kPepperFlashBaseDirectory); | ||
break; | ||
@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
cur = cur.Append(FILE_PATH_LITERAL("script.log")); | ||
break; | ||
case chrome::FILE_FLASH_PLUGIN: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) | ||
return false; | ||
cur = cur.Append(kInternalFlashPluginFileName); | ||
break; | ||
@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
// We currently need a path here to look up whether the plugin is disabled | ||
// and what its permissions are. | ||
case chrome::FILE_NACL_PLUGIN: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "NACL")) | ||
return false; | ||
cur = cur.Append(kInternalNaClPluginFileName); | ||
break; | ||
@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
cur = cur.DirName(); | ||
} | ||
#else | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) | ||
return false; | ||
#endif | ||
cur = cur.Append(FILE_PATH_LITERAL("pnacl")); | ||
@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
// In the component case, this is the source adapter. Otherwise, it is the | ||
// actual Pepper module that gets loaded. | ||
case chrome::FILE_WIDEVINE_CDM_ADAPTER: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) | ||
return false; | ||
cur = cur.AppendASCII(kWidevineCdmAdapterFileName); | ||
break; |