Simplify infobar expiry.

chrome/browser/ui/startup/autolaunch_prompt_win.cc

 // Copyright (c) 2012 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/ui/startup/autolaunch_prompt.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 30 matching lines @@
   static void Create(InfoBarService* infobar_service, Profile* profile);
 
  private:
   explicit AutolaunchInfoBarDelegate(Profile* profile);
   ~AutolaunchInfoBarDelegate() override;
 
   void set_should_expire() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   int GetIconID() const override;
-  bool ShouldExpireInternal(const NavigationDetails& details) const override;
+  bool ShouldExpire(const NavigationDetails& details) const override;
   base::string16 GetMessageText() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
 
   // Weak pointer to the profile, not owned by us.
   Profile* profile_;
 
   // Whether the info-bar should be dismissed on the next navigation.
   bool should_expire_;
@@ skipping 31 matching lines @@
       base::TimeDelta::FromSeconds(8));
 }
 
 AutolaunchInfoBarDelegate::~AutolaunchInfoBarDelegate() {
 }
 
 int AutolaunchInfoBarDelegate::GetIconID() const {
   return IDR_PRODUCT_LOGO_32;
 }
 
-bool AutolaunchInfoBarDelegate::ShouldExpireInternal(
+bool AutolaunchInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
-  return should_expire_;
+  return should_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
 base::string16 AutolaunchInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_AUTO_LAUNCH_INFOBAR_TEXT);
 }
 
 base::string16 AutolaunchInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTO_LAUNCH_OK : IDS_AUTO_LAUNCH_REVERT);
@@ skipping 48 matching lines @@
       InfoBarService::FromWebContents(web_contents),
       Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   return true;
 }
 
 void RegisterAutolaunchUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kShownAutoLaunchInfobar, 0);
 }
 
 }  // namespace chrome