diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 02:42:14 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 02:42:14 +0000 |
| commit | f520b5b5e0822d6ea04edcf064274ac515581806 (patch) | |
| tree | 778819460ce7ca1fd66f97e2bed0fba0200b7eba /chrome/browser/browser_process_impl.cc | |
| parent | 255f8277e7e4f9e19b8f19988ded37e38c932c73 (diff) | |
| download | chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.zip chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.tar.gz chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.tar.bz2 | |
Revert r108760 / reland r108744, r108753 w/ fix
Modify code in chrome to call wrapper functions on PluginService
TBR=rsesek@chromium.org, jam@chromium.org
BUG=90442
TEST=browser_tests PluginServiceTest.* pass on the Mac
Review URL: http://codereview.chromium.org/8493026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d1ef581..984e89f 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -61,7 +61,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/default_plugin.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/json_pref_store.h" @@ -90,7 +89,6 @@ #include "net/url_request/url_request_context_getter.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" -#include "webkit/plugins/npapi/plugin_list.h" #if defined(OS_WIN) #include "views/focus/view_storage.h" @@ -792,15 +790,12 @@ void BrowserProcessImpl::CreateIOThread() { plugin_service->set_filter(ChromePluginServiceFilter::GetInstance()); plugin_service->StartWatchingPlugins(); - // Add the Chrome specific plugins. - chrome::RegisterInternalDefaultPlugin(); - // Register the internal Flash if available. FilePath path; if (!CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableInternalFlash) && PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) { - webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(path); + plugin_service->AddExtraPluginPath(path); } #if defined(OS_POSIX) @@ -808,8 +803,7 @@ void BrowserProcessImpl::CreateIOThread() { // e.g. ~/.config/chromium/Plugins. FilePath user_data_dir; if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { - webkit::npapi::PluginList::Singleton()->AddExtraPluginDir( - user_data_dir.Append("Plugins")); + plugin_service->AddExtraPluginPath(user_data_dir.Append("Plugins")); } #endif |