| Index: chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
|
| diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
|
| index a66a8bfaeed1e6ea22d43da7abdb9c584a2c9c1f..2899a77c07358469be204d0bb24fa138f078b3c2 100644
|
| --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
|
| +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/first_run/first_run.h"
|
| #include "chrome/browser/infobars/confirm_infobar_delegate.h"
|
| #include "chrome/browser/infobars/infobar.h"
|
| +#include "chrome/browser/infobars/infobar_manager.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| #import "chrome/browser/mac/keystone_glue.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -57,8 +58,8 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
|
| virtual bool Accept() OVERRIDE;
|
| virtual bool Cancel() OVERRIDE;
|
| - virtual bool ShouldExpireInternal(
|
| - const content::LoadCommittedDetails& details) const OVERRIDE;
|
| + virtual bool ShouldExpireInternal(const NavigationDetails& details) const
|
| + OVERRIDE;
|
|
|
| // The prefs to use.
|
| PrefService* prefs_; // weak
|
| @@ -85,8 +86,8 @@ void KeystonePromotionInfoBarDelegate::Create() {
|
| InfoBarService::FromWebContents(webContents);
|
| infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
|
| scoped_ptr<ConfirmInfoBarDelegate>(new KeystonePromotionInfoBarDelegate(
|
| - Profile::FromBrowserContext(
|
| - webContents->GetBrowserContext())->GetPrefs()))));
|
| + Profile::FromBrowserContext(webContents->GetBrowserContext())
|
| + ->GetPrefs()))));
|
| }
|
|
|
| KeystonePromotionInfoBarDelegate::KeystonePromotionInfoBarDelegate(
|
| @@ -132,7 +133,7 @@ bool KeystonePromotionInfoBarDelegate::Cancel() {
|
| }
|
|
|
| bool KeystonePromotionInfoBarDelegate::ShouldExpireInternal(
|
| - const content::LoadCommittedDetails& details) const {
|
| + const NavigationDetails& details) const {
|
| return can_expire_;
|
| }
|
|
|
|
|