| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h" | 5 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
| 8 #include "chrome/browser/infobars/infobar_service.h" | 8 #include "chrome/browser/infobars/infobar_service.h" |
| 9 #include "chrome/common/render_messages.h" | 9 #include "chrome/common/render_messages.h" |
| 10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
| 11 #include "components/google/core/browser/google_util.h" | 11 #include "components/google/core/browser/google_util.h" |
| 12 #include "components/infobars/core/infobar.h" | 12 #include "components/infobars/core/infobar.h" |
| 13 #include "content/public/browser/render_frame_host.h" | 13 #include "content/public/browser/render_frame_host.h" |
| 14 #include "content/public/browser/render_view_host.h" | 14 #include "content/public/browser/render_view_host.h" |
| 15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 16 #include "grit/components_strings.h" | 16 #include "grit/components_strings.h" |
| 17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
| 18 #include "ui/base/page_transition_types.h" | 18 #include "ui/base/page_transition_types.h" |
| 19 | 19 |
| 20 | 20 |
| 21 // static | 21 // static |
| 22 void InsecureContentInfoBarDelegate::Create(InfoBarService* infobar_service, | 22 void InsecureContentInfoBarDelegate::Create(InfoBarService* infobar_service, |
| 23 InfoBarType type) { | 23 InfoBarType type) { |
| 24 scoped_ptr<infobars::InfoBar> new_infobar( | 24 scoped_ptr<infobars::InfoBar> new_infobar( |
| 25 ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>( | 25 ConfirmInfoBarDelegate::CreateInfoBar( |
| 26 new InsecureContentInfoBarDelegate(type)))); | 26 infobar_service, scoped_ptr<ConfirmInfoBarDelegate>( |
| 27 new InsecureContentInfoBarDelegate(type)))); |
| 27 | 28 |
| 28 // Only supsersede an existing insecure content infobar if we are upgrading | 29 // Only supsersede an existing insecure content infobar if we are upgrading |
| 29 // from DISPLAY to RUN. | 30 // from DISPLAY to RUN. |
| 30 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { | 31 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { |
| 31 infobars::InfoBar* old_infobar = infobar_service->infobar_at(i); | 32 infobars::InfoBar* old_infobar = infobar_service->infobar_at(i); |
| 32 InsecureContentInfoBarDelegate* delegate = | 33 InsecureContentInfoBarDelegate* delegate = |
| 33 old_infobar->delegate()->AsInsecureContentInfoBarDelegate(); | 34 old_infobar->delegate()->AsInsecureContentInfoBarDelegate(); |
| 34 if (delegate != NULL) { | 35 if (delegate != NULL) { |
| 35 if ((type == RUN) && (delegate->type_ == DISPLAY)) | 36 if ((type == RUN) && (delegate->type_ == DISPLAY)) |
| 36 return; | 37 return; |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 WindowOpenDisposition disposition) { | 113 WindowOpenDisposition disposition) { |
| 113 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( | 114 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( |
| 114 content::OpenURLParams( | 115 content::OpenURLParams( |
| 115 GURL("https://www.google.com/" | 116 GURL("https://www.google.com/" |
| 116 "support/chrome/bin/answer.py?answer=1342714"), | 117 "support/chrome/bin/answer.py?answer=1342714"), |
| 117 content::Referrer(), | 118 content::Referrer(), |
| 118 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, | 119 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, |
| 119 ui::PAGE_TRANSITION_LINK, false)); | 120 ui::PAGE_TRANSITION_LINK, false)); |
| 120 return false; | 121 return false; |
| 121 } | 122 } |
| OLD | NEW |