diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 23:10:56 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 23:10:56 +0000 |
| commit | 50285fffa5e44c61cbf6141908c6297fbd0b20d4 (patch) | |
| tree | 5fb535a307298d93e4c885c40856303784cbf543 /chrome/common/chrome_paths.cc | |
| parent | 1ad795b4c02d1fd42743252685bd411619a2d4e2 (diff) | |
| download | chromium_src-50285fffa5e44c61cbf6141908c6297fbd0b20d4.zip chromium_src-50285fffa5e44c61cbf6141908c6297fbd0b20d4.tar.gz chromium_src-50285fffa5e44c61cbf6141908c6297fbd0b20d4.tar.bz2 | |
Remove Gears from Chrome.
There are probably a few more bits and pieces that can be removed, but I think this is the majority of it.
BUG=51934
Review URL: http://codereview.chromium.org/6576020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index afa0b7a..35c01d1 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; |