| Index: chrome/browser/api/infobars/infobar_delegate.cc
|
| diff --git a/chrome/browser/api/infobars/infobar_delegate.cc b/chrome/browser/api/infobars/infobar_delegate.cc
|
| index 69f66251c316d26ef9e7788fa7a71a03644ee291..fa401ac5f06bf1b1e694dd9830da8ca3474fdf4b 100644
|
| --- a/chrome/browser/api/infobars/infobar_delegate.cc
|
| +++ b/chrome/browser/api/infobars/infobar_delegate.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "build/build_config.h"
|
| -#include "chrome/browser/infobars/infobar_tab_helper.h"
|
| +#include "chrome/browser/api/infobars/infobar_tab_service.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_details.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| @@ -90,17 +90,17 @@ TranslateInfoBarDelegate* InfoBarDelegate::AsTranslateInfoBarDelegate() {
|
| return NULL;
|
| }
|
|
|
| -InfoBarDelegate::InfoBarDelegate(InfoBarTabHelper* infobar_helper)
|
| +InfoBarDelegate::InfoBarDelegate(InfoBarTabService* infobar_service)
|
| : contents_unique_id_(0),
|
| - owner_(infobar_helper) {
|
| - if (infobar_helper)
|
| - StoreActiveEntryUniqueID(infobar_helper);
|
| + owner_(infobar_service) {
|
| + if (infobar_service)
|
| + StoreActiveEntryUniqueID(infobar_service);
|
| }
|
|
|
| void InfoBarDelegate::StoreActiveEntryUniqueID(
|
| - InfoBarTabHelper* infobar_helper) {
|
| + InfoBarTabService* infobar_service) {
|
| NavigationEntry* active_entry =
|
| - infobar_helper->web_contents()->GetController().GetActiveEntry();
|
| + infobar_service->GetWebContents()->GetController().GetActiveEntry();
|
| contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0;
|
| }
|
|
|
|
|