Chromium Code Reviews| Index: chrome/browser/infobars/insecure_content_infobar_delegate.h |
| diff --git a/chrome/browser/infobars/insecure_content_infobar_delegate.h b/chrome/browser/infobars/insecure_content_infobar_delegate.h |
| index eb59556f707300e987670918eb548cf9578bf455..ef62c89436f37490604c1e5a3e8628f73ba8cf5a 100644 |
| --- a/chrome/browser/infobars/insecure_content_infobar_delegate.h |
| +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.h |
| @@ -13,16 +13,11 @@ class InfoBarService; |
| // display or run insecure content. |
| class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate { |
| public: |
| - enum InfoBarType { |
| - DISPLAY, // Shown when "inactive" content (e.g. images) has been blocked. |
| - RUN, // Shown when "active" content (e.g. script) has been blocked. |
| - }; |
| - |
| - // Depending on the |type| requested and whether an insecure content infobar |
| - // is already present in |infobar_service|, may do nothing; otherwise, creates |
| + // Depending on whether an insecure content infobar is already present in |
| + // |infobar_service|, may do nothing; otherwise, creates |
|
Peter Kasting
2015/01/27 19:25:22
This comment is no longer accurate, since Create()
Robert Sesek
2015/01/27 20:33:21
Done.
|
| // an insecure content infobar and delegate and either adds the infobar to |
| // |infobar_service| or replaces the existing infobar. |
| - static void Create(InfoBarService* infobar_service, InfoBarType type); |
| + static void Create(InfoBarService* infobar_service); |
| private: |
| enum HistogramEvents { |
| @@ -30,14 +25,10 @@ class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate { |
| DISPLAY_USER_OVERRIDE, // User clicked allow anyway button. |
| DISPLAY_USER_DID_NOT_LOAD, // User clicked the don't load button. |
| DISPLAY_INFOBAR_DISMISSED, // User clicked close button. |
| - RUN_INFOBAR_SHOWN, |
| - RUN_USER_OVERRIDE, |
| - RUN_USER_DID_NOT_LOAD, |
| - RUN_INFOBAR_DISMISSED, |
| NUM_EVENTS |
| }; |
| - explicit InsecureContentInfoBarDelegate(InfoBarType type); |
| + InsecureContentInfoBarDelegate(); |
| ~InsecureContentInfoBarDelegate() override; |
| // ConfirmInfoBarDelegate: |
| @@ -50,9 +41,7 @@ class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate { |
| base::string16 GetLinkText() const override; |
| bool LinkClicked(WindowOpenDisposition disposition) override; |
| - InfoBarType type_; |
| - |
| - DISALLOW_IMPLICIT_CONSTRUCTORS(InsecureContentInfoBarDelegate); |
| + DISALLOW_COPY_AND_ASSIGN(InsecureContentInfoBarDelegate); |
| }; |
| #endif // CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ |