Replace the virtual InfoBarDelegate::InfoBarClosed() function with a non-virtual one. This is a ...

chrome/browser/plugin_observer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/plugin_observer.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/plugin_installer_infobar_delegate.h"
@@ skipping 20 matching lines @@
 // PluginInfoBarDelegate ------------------------------------------------------
 
 class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   PluginInfoBarDelegate(TabContents* tab_contents, const string16& name);
 
  protected:
   virtual ~PluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual void InfoBarClosed();
-  virtual bool Cancel();
-  virtual bool LinkClicked(WindowOpenDisposition disposition);
+  virtual bool Cancel() OVERRIDE;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   virtual std::string GetLearnMoreURL() const = 0;
 
   string16 name_;
   TabContents* tab_contents_;
 
  private:
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const;
   virtual string16 GetLinkText();
 
   DISALLOW_COPY_AND_ASSIGN(PluginInfoBarDelegate);
 };
 
 PluginInfoBarDelegate::PluginInfoBarDelegate(TabContents* tab_contents,
                                              const string16& name)
     : ConfirmInfoBarDelegate(tab_contents),
       name_(name),
       tab_contents_(tab_contents) {
 }
 
 PluginInfoBarDelegate::~PluginInfoBarDelegate() {
 }
 
-void PluginInfoBarDelegate::InfoBarClosed() {
-  delete this;
-}
-
 bool PluginInfoBarDelegate::Cancel() {
   tab_contents_->render_view_host()->Send(new ViewMsg_LoadBlockedPlugins(
       tab_contents_->render_view_host()->routing_id()));
   return true;
 }
 
 bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   GURL url = google_util::AppendGoogleLocaleParam(GURL(GetLearnMoreURL()));
   tab_contents_->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   return false;
@@ skipping 13 matching lines @@
 
 class BlockedPluginInfoBarDelegate : public PluginInfoBarDelegate {
  public:
   BlockedPluginInfoBarDelegate(TabContents* tab_contents,
                                const string16& name);
 
  private:
   virtual ~BlockedPluginInfoBarDelegate();
 
   // PluginInfoBarDelegate:
-  virtual string16 GetMessageText() const;
-  virtual string16 GetButtonLabel(InfoBarButton button) const;
-  virtual bool Accept();
-  virtual bool Cancel();
-  virtual void InfoBarClosed();
-  virtual void InfoBarDismissed();
-  virtual bool LinkClicked(WindowOpenDisposition disposition);
-  virtual std::string GetLearnMoreURL() const;
+  virtual string16 GetMessageText() const OVERRIDE;
+  virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
+  virtual bool Accept() OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
+  virtual void InfoBarDismissed() OVERRIDE;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual std::string GetLearnMoreURL() const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(BlockedPluginInfoBarDelegate);
 };
 
 BlockedPluginInfoBarDelegate::BlockedPluginInfoBarDelegate(
     TabContents* tab_contents,
     const string16& utf16_name)
     : PluginInfoBarDelegate(tab_contents, utf16_name) {
   UserMetrics::RecordAction(UserMetricsAction("BlockedPluginInfobar.Shown"));
   std::string name = UTF16ToUTF8(utf16_name);
   if (name == webkit::npapi::PluginGroup::kJavaGroupName)
     UserMetrics::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.Java"));
   else if (name == webkit::npapi::PluginGroup::kQuickTimeGroupName)
     UserMetrics::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.QuickTime"));
   else if (name == webkit::npapi::PluginGroup::kShockwaveGroupName)
     UserMetrics::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.Shockwave"));
   else if (name == webkit::npapi::PluginGroup::kRealPlayerGroupName)
     UserMetrics::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.RealPlayer"));
 }
 
 BlockedPluginInfoBarDelegate::~BlockedPluginInfoBarDelegate() {
+  UserMetrics::RecordAction(UserMetricsAction("BlockedPluginInfobar.Closed"));
 }
 
 std::string BlockedPluginInfoBarDelegate::GetLearnMoreURL() const {
   return chrome::kBlockedPluginLearnMoreURL;
 }
 
 string16 BlockedPluginInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_NOT_AUTHORIZED, name_);
 }
 
@@ skipping 16 matching lines @@
       tab_contents_->GetURL(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),
       CONTENT_SETTING_ALLOW);
   return PluginInfoBarDelegate::Cancel();
 }
 
 void BlockedPluginInfoBarDelegate::InfoBarDismissed() {
   UserMetrics::RecordAction(
       UserMetricsAction("BlockedPluginInfobar.Dismissed"));
 }
 
-void BlockedPluginInfoBarDelegate::InfoBarClosed() {
-  UserMetrics::RecordAction(UserMetricsAction("BlockedPluginInfobar.Closed"));
-  PluginInfoBarDelegate::InfoBarClosed();
-}
-
 bool BlockedPluginInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(
       UserMetricsAction("BlockedPluginInfobar.LearnMore"));
   return PluginInfoBarDelegate::LinkClicked(disposition);
 }
 
 // OutdatedPluginInfoBarDelegate ----------------------------------------------
 
 class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate {
  public:
   OutdatedPluginInfoBarDelegate(TabContents* tab_contents,
                                 const string16& name,
                                 const GURL& update_url);
 
  private:
   virtual ~OutdatedPluginInfoBarDelegate();
 
   // PluginInfoBarDelegate:
-  virtual string16 GetMessageText() const;
-  virtual string16 GetButtonLabel(InfoBarButton button) const;
-  virtual bool Accept();
-  virtual bool Cancel();
-  virtual void InfoBarClosed();
-  virtual void InfoBarDismissed();
-  virtual bool LinkClicked(WindowOpenDisposition disposition);
-  virtual std::string GetLearnMoreURL() const;
+  virtual string16 GetMessageText() const OVERRIDE;
+  virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
+  virtual bool Accept() OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
+  virtual void InfoBarDismissed() OVERRIDE;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual std::string GetLearnMoreURL() const OVERRIDE;
 
   GURL update_url_;
 
   DISALLOW_COPY_AND_ASSIGN(OutdatedPluginInfoBarDelegate);
 };
 
 OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate(
     TabContents* tab_contents,
     const string16& utf16_name,
     const GURL& update_url)
@@ skipping 15 matching lines @@
         UserMetricsAction("OutdatedPluginInfobar.Shown.RealPlayer"));
   else if (name == webkit::npapi::PluginGroup::kSilverlightGroupName)
     UserMetrics::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Silverlight"));
   else if (name == webkit::npapi::PluginGroup::kAdobeReaderGroupName)
     UserMetrics::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Reader"));
 }
 
 OutdatedPluginInfoBarDelegate::~OutdatedPluginInfoBarDelegate() {
+  UserMetrics::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Closed"));
 }
 
 std::string OutdatedPluginInfoBarDelegate::GetLearnMoreURL() const {
   return chrome::kOutdatedPluginLearnMoreURL;
 }
 
 string16 OutdatedPluginInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED_PROMPT, name_);
 }
 
@@ skipping 14 matching lines @@
   UserMetrics::RecordAction(
       UserMetricsAction("OutdatedPluginInfobar.AllowThisTime"));
   return PluginInfoBarDelegate::Cancel();
 }
 
 void OutdatedPluginInfoBarDelegate::InfoBarDismissed() {
   UserMetrics::RecordAction(
       UserMetricsAction("OutdatedPluginInfobar.Dismissed"));
 }
 
-void OutdatedPluginInfoBarDelegate::InfoBarClosed() {
-  UserMetrics::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Closed"));
-  PluginInfoBarDelegate::InfoBarClosed();
-}
-
 bool OutdatedPluginInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(
       UserMetricsAction("OutdatedPluginInfobar.LearnMore"));
   return PluginInfoBarDelegate::LinkClicked(disposition);
 }
 
 }  // namespace
 
 
@@ skipping 70 matching lines @@
       true));
 }
 
 void PluginObserver::OnBlockedOutdatedPlugin(const string16& name,
                                              const GURL& update_url) {
   tab_contents()->AddInfoBar(update_url.is_empty() ?
       static_cast<InfoBarDelegate*>(new BlockedPluginInfoBarDelegate(
           tab_contents(), name)) :
       new OutdatedPluginInfoBarDelegate(tab_contents(), name, update_url));
 }