| Index: chrome/common/chrome_paths.cc
|
| diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
|
| index afa0b7aea775e77e5391a8686e47d126e1d005e9..35c01d176f3150cac1bd21c93a829c5d1b8493be 100644
|
| --- a/chrome/common/chrome_paths.cc
|
| +++ b/chrome/common/chrome_paths.cc
|
| @@ -73,19 +73,6 @@ bool GetInternalPluginsDirectory(FilePath* result) {
|
| return PathService::Get(base::DIR_MODULE, result);
|
| }
|
|
|
| -bool GetGearsPluginPathFromCommandLine(FilePath* path) {
|
| -#ifndef NDEBUG
|
| - // for debugging, support a cmd line based override
|
| - FilePath plugin_path =
|
| - CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| - switches::kGearsPluginPathOverride);
|
| - *path = plugin_path;
|
| - return !plugin_path.empty();
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| bool PathProvider(int key, FilePath* result) {
|
| // Some keys are just aliases...
|
| switch (key) {
|
| @@ -218,29 +205,6 @@ bool PathProvider(int key, FilePath* result) {
|
| return false;
|
| cur = cur.Append(FILE_PATH_LITERAL("script.log"));
|
| break;
|
| - case chrome::FILE_GEARS_PLUGIN:
|
| - if (!GetGearsPluginPathFromCommandLine(&cur)) {
|
| -#if defined(OS_WIN)
|
| - // Search for gears.dll alongside chrome.dll first. This new model
|
| - // allows us to package gears.dll with the Chrome installer and update
|
| - // it while Chrome is running.
|
| - if (!GetInternalPluginsDirectory(&cur))
|
| - return false;
|
| - cur = cur.Append(FILE_PATH_LITERAL("gears.dll"));
|
| -
|
| - if (!file_util::PathExists(cur)) {
|
| - if (!PathService::Get(base::DIR_EXE, &cur))
|
| - return false;
|
| - cur = cur.Append(FILE_PATH_LITERAL("plugins"));
|
| - cur = cur.Append(FILE_PATH_LITERAL("gears"));
|
| - cur = cur.Append(FILE_PATH_LITERAL("gears.dll"));
|
| - }
|
| -#else
|
| - // No gears.dll on non-Windows systems.
|
| - return false;
|
| -#endif
|
| - }
|
| - break;
|
| case chrome::FILE_FLASH_PLUGIN:
|
| if (!GetInternalPluginsDirectory(&cur))
|
| return false;
|
|
|