| Index: chrome/browser/tab_contents/tab_contents.cc
|
| diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
|
| index 4215528e02daaaa2cc4c9f02be2f7ca7fbceb11d..cbb0119d27ba80a61745899b7ff0af457ef32f32 100644
|
| --- a/chrome/browser/tab_contents/tab_contents.cc
|
| +++ b/chrome/browser/tab_contents/tab_contents.cc
|
| @@ -244,9 +244,9 @@ void MakeNavigateParams(const NavigationEntry& entry,
|
| params->request_time = base::Time::Now();
|
| }
|
|
|
| -class DisabledPluginInfoBar : public ConfirmInfoBarDelegate {
|
| +class OutdatedPluginInfoBar : public ConfirmInfoBarDelegate {
|
| public:
|
| - DisabledPluginInfoBar(TabContents* tab_contents,
|
| + OutdatedPluginInfoBar(TabContents* tab_contents,
|
| const string16& name,
|
| const GURL& update_url)
|
| : ConfirmInfoBarDelegate(tab_contents),
|
| @@ -288,9 +288,8 @@ class DisabledPluginInfoBar : public ConfirmInfoBarDelegate {
|
| }
|
|
|
| virtual bool Cancel() {
|
| - tab_contents_->OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(),
|
| - NEW_FOREGROUND_TAB, PageTransition::LINK);
|
| - return false;
|
| + tab_contents_->render_view_host()->LoadBlockedPlugins();
|
| + return true;
|
| }
|
|
|
| virtual bool LinkClicked(WindowOpenDisposition disposition) {
|
| @@ -2091,9 +2090,9 @@ void TabContents::OnInstallApplication(const WebApplicationInfo& info) {
|
| delegate()->OnInstallApplication(this, info);
|
| }
|
|
|
| -void TabContents::OnDisabledOutdatedPlugin(const string16& name,
|
| - const GURL& update_url) {
|
| - new DisabledPluginInfoBar(this, name, update_url);
|
| +void TabContents::OnBlockedOutdatedPlugin(const string16& name,
|
| + const GURL& update_url) {
|
| + new OutdatedPluginInfoBar(this, name, update_url);
|
| }
|
|
|
| void TabContents::OnPageContents(const GURL& url,
|
|
|