| Index: chrome/browser/ui/startup/default_browser_prompt.cc
|
| diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc
|
| index fcd0798c6fa1c2a8f8b9a65b93e5f331e55ada5a..585339997220f2919725a5297aba082a9eac5198 100644
|
| --- a/chrome/browser/ui/startup/default_browser_prompt.cc
|
| +++ b/chrome/browser/ui/startup/default_browser_prompt.cc
|
| @@ -74,12 +74,12 @@ class DefaultBrowserInfoBarDelegate : public ConfirmInfoBarDelegate {
|
|
|
| // ConfirmInfoBarDelegate:
|
| int GetIconID() const override;
|
| + bool ShouldExpireInternal(const NavigationDetails& details) const override;
|
| base::string16 GetMessageText() const override;
|
| base::string16 GetButtonLabel(InfoBarButton button) const override;
|
| bool OKButtonTriggersUACPrompt() const override;
|
| bool Accept() override;
|
| bool Cancel() override;
|
| - bool ShouldExpireInternal(const NavigationDetails& details) const override;
|
|
|
| // The prefs to use.
|
| PrefService* prefs_;
|
| @@ -136,6 +136,11 @@ int DefaultBrowserInfoBarDelegate::GetIconID() const {
|
| return IDR_PRODUCT_LOGO_32;
|
| }
|
|
|
| +bool DefaultBrowserInfoBarDelegate::ShouldExpireInternal(
|
| + const NavigationDetails& details) const {
|
| + return should_expire_;
|
| +}
|
| +
|
| base::string16 DefaultBrowserInfoBarDelegate::GetMessageText() const {
|
| return l10n_util::GetStringUTF16(IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT);
|
| }
|
| @@ -169,11 +174,6 @@ bool DefaultBrowserInfoBarDelegate::Cancel() {
|
| return true;
|
| }
|
|
|
| -bool DefaultBrowserInfoBarDelegate::ShouldExpireInternal(
|
| - const NavigationDetails& details) const {
|
| - return should_expire_;
|
| -}
|
| -
|
| void NotifyNotDefaultBrowserCallback(chrome::HostDesktopType desktop_type) {
|
| Browser* browser = chrome::FindLastActiveWithHostDesktopType(desktop_type);
|
| if (!browser)
|
|
|