| Index: chrome/browser/plugin_observer.cc
|
| ===================================================================
|
| --- chrome/browser/plugin_observer.cc (revision 99462)
|
| +++ chrome/browser/plugin_observer.cc (working copy)
|
| @@ -10,7 +10,6 @@
|
| #include "chrome/browser/infobars/infobar_tab_helper.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
|
| -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| #include "chrome/common/render_messages.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -293,7 +292,6 @@
|
|
|
| bool PluginObserver::OnMessageReceived(const IPC::Message& message) {
|
| IPC_BEGIN_MESSAGE_MAP(PluginObserver, message)
|
| - IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin)
|
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedOutdatedPlugin,
|
| OnBlockedOutdatedPlugin)
|
| IPC_MESSAGE_UNHANDLED(return false)
|
| @@ -302,33 +300,6 @@
|
| return true;
|
| }
|
|
|
| -void PluginObserver::OnCrashedPlugin(const FilePath& plugin_path) {
|
| - DCHECK(!plugin_path.value().empty());
|
| -
|
| - string16 plugin_name = plugin_path.LossyDisplayName();
|
| - webkit::WebPluginInfo plugin_info;
|
| - if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
|
| - plugin_path, &plugin_info) &&
|
| - !plugin_info.name.empty()) {
|
| - plugin_name = plugin_info.name;
|
| -#if defined(OS_MACOSX)
|
| - // Many plugins on the Mac have .plugin in the actual name, which looks
|
| - // terrible, so look for that and strip it off if present.
|
| - const std::string kPluginExtension = ".plugin";
|
| - if (EndsWith(plugin_name, ASCIIToUTF16(kPluginExtension), true))
|
| - plugin_name.erase(plugin_name.length() - kPluginExtension.length());
|
| -#endif // OS_MACOSX
|
| - }
|
| - gfx::Image* icon = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
| - IDR_INFOBAR_PLUGIN_CRASHED);
|
| - tab_contents_->infobar_tab_helper()->AddInfoBar(
|
| - new SimpleAlertInfoBarDelegate(
|
| - tab_contents(),
|
| - icon,
|
| - l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT, plugin_name),
|
| - true));
|
| -}
|
| -
|
| void PluginObserver::OnBlockedOutdatedPlugin(const string16& name,
|
| const GURL& update_url) {
|
| tab_contents_->infobar_tab_helper()->AddInfoBar(update_url.is_empty() ?
|
|
|