diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-23 21:37:19 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-23 21:37:19 +0000 |
| commit | 72a7922929363288647ccce827a56a752be66c24 (patch) | |
| tree | 334da92bd86e929c27377510d1c914f252e31e0d /webkit/glue/plugins | |
| parent | 72eda1ddddee92cd63efb4279fe4fe04729255c3 (diff) | |
| download | chromium_src-72a7922929363288647ccce827a56a752be66c24.zip chromium_src-72a7922929363288647ccce827a56a752be66c24.tar.gz chromium_src-72a7922929363288647ccce827a56a752be66c24.tar.bz2 | |
Remove code to load plugins on mac from Contents/PlugIns.
TestShell no longer needs this since we load from {Debug,Release}/plugins
now. Also remove the code to copy the plugin into
TestShell.app/Contents/PlugIns.
BUG=48471
Review URL: http://codereview.chromium.org/5274001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index ee6c6ad..6e5019d 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -30,14 +30,6 @@ void GetPluginCommonDirectory(std::vector<FilePath>* plugin_dirs, plugin_dirs->push_back(FilePath(mac_util::PathFromFSRef(ref))); } -void GetPluginPrivateDirectory(std::vector<FilePath>* plugin_dirs) { - NSString* plugin_path = [[NSBundle mainBundle] builtInPlugInsPath]; - if (!plugin_path) - return; - - plugin_dirs->push_back(FilePath([plugin_path fileSystemRepresentation])); -} - // Returns true if the plugin should be prevented from loading. bool IsBlacklistedPlugin(const WebPluginInfo& info) { // We blacklist Gears by included MIME type, since that is more stable than @@ -68,10 +60,6 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { // Load from the machine-wide area GetPluginCommonDirectory(plugin_dirs, false); - - // Load any bundled plugins (deprecated) - // TODO(stuartmorgan): Remove this once it's not used in TestShell. - GetPluginPrivateDirectory(plugin_dirs); } void PluginList::LoadPluginsFromDir(const FilePath &path, |