summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 01:49:55 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 01:49:55 +0000
commit540c42cdba879e85110ad79fbcb095dac1d6a95a (patch)
tree1c160cbfc85f4cb62880b863f72cd786cab1a36a
parent16e28a65e10820a9347a607a2b3b8c6a4598b3e2 (diff)
downloadchromium_src-540c42cdba879e85110ad79fbcb095dac1d6a95a.zip
chromium_src-540c42cdba879e85110ad79fbcb095dac1d6a95a.tar.gz
chromium_src-540c42cdba879e85110ad79fbcb095dac1d6a95a.tar.bz2
Revert 103142 - [Linux] Move plugin probing back in-process. This temporarily undoes r102971.
[Trying to get metrics services working again. Will also revert 102971 and 102421] BUG=17863,98294 TEST=With the Totem plugin installed, launch Chromium and go to about:plugins. You have plugins. Review URL: http://codereview.chromium.org/8059039 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/8102016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103617 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/plugin_service.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index f6d61d6..1239a27 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -66,7 +66,7 @@ static void GetPluginsForGroupsCallback(
// correct thread.
void WillLoadPluginsCallback() {
// TODO(rsesek): Change these to CHECKs.
-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
+#if defined(OS_WIN)
LOG_IF(ERROR, !BrowserThread::CurrentlyOn(BrowserThread::FILE));
#else
LOG(ERROR) << "Plugin loading should happen out-of-process.";
@@ -112,13 +112,6 @@ class PluginLoaderClient : public UtilityProcessHost::Client {
return handled;
}
- virtual void OnProcessCrashed(int exit_code) OVERRIDE {
- LOG(ERROR) << "Out-of-process plugin loader crashed with code " << exit_code
- << ". You will have no plugins!";
- // Don't leave callers hanging.
- OnGotPlugins(std::vector<webkit::WebPluginInfo>());
- }
-
virtual void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins) {
webkit::npapi::PluginList::Singleton()->SetPlugins(plugins);
target_loop_->PostTask(FROM_HERE,
@@ -523,7 +516,7 @@ void PluginService::GetPlugins(const GetPluginsCallback& callback) {
scoped_refptr<base::MessageLoopProxy> target_loop(
MessageLoop::current()->message_loop_proxy());
-#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
+#if defined(OS_WIN)
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
base::Bind(&PluginService::GetPluginsInternal, base::Unretained(this),
target_loop, callback));