Index: chrome/browser/extensions/api/debugger/debugger_api.cc |
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc |
index e965066e82d160b6b94f6bbe6486253c26a8d525..f506c33e2af1b18052ba18a361df19060d022dbc 100644 |
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc |
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc |
@@ -157,8 +157,8 @@ class ExtensionDevToolsInfoBarDelegate : public ConfirmInfoBarDelegate { |
// ConfirmInfoBarDelegate: |
virtual void InfoBarDismissed() OVERRIDE; |
virtual Type GetInfoBarType() const OVERRIDE; |
- virtual bool ShouldExpireInternal( |
- const content::LoadCommittedDetails& details) const OVERRIDE; |
+ virtual bool ShouldExpireInternal(const NavigationDetails& details) const |
+ OVERRIDE; |
virtual base::string16 GetMessageText() const OVERRIDE; |
virtual int GetButtons() const OVERRIDE; |
virtual bool Cancel() OVERRIDE; |
@@ -185,8 +185,8 @@ InfoBar* ExtensionDevToolsInfoBarDelegate::Create( |
if (!infobar_service) |
return NULL; |
- return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( |
- scoped_ptr<ConfirmInfoBarDelegate>( |
+ return infobar_service->AddInfoBar( |
+ ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>( |
new ExtensionDevToolsInfoBarDelegate(client_name)))); |
} |
@@ -210,7 +210,7 @@ InfoBarDelegate::Type ExtensionDevToolsInfoBarDelegate::GetInfoBarType() const { |
} |
bool ExtensionDevToolsInfoBarDelegate::ShouldExpireInternal( |
- const content::LoadCommittedDetails& details) const { |
+ const NavigationDetails& details) const { |
return false; |
} |
@@ -339,8 +339,10 @@ ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() { |
if (infobar_) { |
static_cast<ExtensionDevToolsInfoBarDelegate*>( |
infobar_->delegate())->set_client_host(NULL); |
- InfoBarService::FromWebContents(WebContents::FromRenderViewHost( |
- agent_host_->GetRenderViewHost()))->RemoveInfoBar(infobar_); |
+ InfoBarService::FromWebContents( |
+ WebContents::FromRenderViewHost(agent_host_->GetRenderViewHost())) |
+ ->infobar_manager() |
+ .RemoveInfoBar(infobar_); |
} |
AttachedClientHosts::GetInstance()->Remove(this); |
} |