diff options
| -rw-r--r-- | content/browser/plugin_service.cc | 11 |
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)); |