Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5623)

Unified Diff: chrome/browser/ui/startup/autolaunch_prompt_win.cc

Issue 1142153002: Simplify infobar expiry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android compile Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/autolaunch_prompt_win.cc
diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
index 7f3559ac79c0496aa2c7123ce292e043cbeb7eeb..071fb75e06f7cfb432100633053a18ab91adb774 100644
--- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc
+++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
@@ -48,7 +48,7 @@ class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
// 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;
@@ -100,9 +100,9 @@ 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 {

Powered by Google App Engine
This is Rietveld 408576698