| Index: chrome/browser/infobars/insecure_content_infobar_delegate.cc
|
| diff --git a/chrome/browser/infobars/insecure_content_infobar_delegate.cc b/chrome/browser/infobars/insecure_content_infobar_delegate.cc
|
| index 1d0a3369679a48a7d92fd553fc9e97ccc5af2f9a..aa1620ab02954474665ad036ee28ff2d824c6cc4 100644
|
| --- a/chrome/browser/infobars/insecure_content_infobar_delegate.cc
|
| +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include "base/metrics/histogram.h"
|
| #include "chrome/browser/google/google_util.h"
|
| -#include "chrome/browser/infobars/infobar.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| #include "chrome/common/render_messages.h"
|
| +#include "components/infobars/core/infobar.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -20,14 +20,14 @@
|
| // static
|
| void InsecureContentInfoBarDelegate::Create(InfoBarService* infobar_service,
|
| InfoBarType type) {
|
| - scoped_ptr<InfoBar> new_infobar(ConfirmInfoBarDelegate::CreateInfoBar(
|
| - scoped_ptr<ConfirmInfoBarDelegate>(
|
| + scoped_ptr<infobars::InfoBar> new_infobar(
|
| + ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
|
| new InsecureContentInfoBarDelegate(type))));
|
|
|
| // Only supsersede an existing insecure content infobar if we are upgrading
|
| // from DISPLAY to RUN.
|
| for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
|
| - InfoBar* old_infobar = infobar_service->infobar_at(i);
|
| + infobars::InfoBar* old_infobar = infobar_service->infobar_at(i);
|
| InsecureContentInfoBarDelegate* delegate =
|
| old_infobar->delegate()->AsInsecureContentInfoBarDelegate();
|
| if (delegate != NULL) {
|
|
|