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

chrome/browser/omnibox_search_hint.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/omnibox_search_hint.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/task.h"
 // TODO(avi): remove when conversions not needed any more
@@ skipping 38 matching lines @@
  public:
   explicit HintInfoBar(OmniboxSearchHint* omnibox_hint);
 
  private:
   virtual ~HintInfoBar();
 
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   virtual bool ShouldExpire(
-      const NavigationController::LoadCommittedDetails& details) const;
-  virtual void InfoBarDismissed();
-  virtual void InfoBarClosed();
-  virtual gfx::Image* GetIcon() const;
-  virtual Type GetInfoBarType() const;
-  virtual string16 GetMessageText() const;
-  virtual int GetButtons() const;
-  virtual string16 GetButtonLabel(InfoBarButton button) const;
-  virtual bool Accept();
+      const NavigationController::LoadCommittedDetails& details) const OVERRIDE;
+  virtual void InfoBarDismissed() OVERRIDE;
+  virtual gfx::Image* GetIcon() const OVERRIDE;
+  virtual Type GetInfoBarType() const OVERRIDE;
+  virtual string16 GetMessageText() const OVERRIDE;
+  virtual int GetButtons() const OVERRIDE;
+  virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
+  virtual bool Accept() OVERRIDE;
 
   // The omnibox hint that shows us.
   OmniboxSearchHint* omnibox_hint_;
 
   // Whether the user clicked one of the buttons.
   bool action_taken_;
 
   // Whether the info-bar should be dismissed on the next navigation.
   bool should_expire_;
 
@@ skipping 10 matching lines @@
       should_expire_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   // We want the info-bar to stick-around for few seconds and then be hidden
   // on the next navigation after that.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       method_factory_.NewRunnableMethod(&HintInfoBar::AllowExpiry),
       8000);  // 8 seconds.
 }
 
 HintInfoBar::~HintInfoBar() {
+  if (!action_taken_)
+    UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Ignored", 1);
 }
 
 bool HintInfoBar::ShouldExpire(
     const NavigationController::LoadCommittedDetails& details) const {
   return should_expire_;
 }
 
 void HintInfoBar::InfoBarDismissed() {
   action_taken_ = true;
   UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Closed", 1);
   // User closed the infobar, let's not bug him again with this in the future.
   omnibox_hint_->DisableHint();
 }
 
-void HintInfoBar::InfoBarClosed() {
-  if (!action_taken_)
-    UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Ignored", 1);
-  delete this;
-}
-
 gfx::Image* HintInfoBar::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
      IDR_INFOBAR_QUESTION_MARK);
 }
 
 InfoBarDelegate::Type HintInfoBar::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 string16 HintInfoBar::GetMessageText() const {
@@ skipping 100 matching lines @@
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSearchInOmniboxHint);
 }