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/google/google_util.h" | 8 #include "chrome/browser/google/google_util.h" |
9 #include "chrome/browser/infobars/infobar.h" | |
10 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
11 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
| 11 #include "components/infobars/core/infobar.h" |
12 #include "content/public/browser/render_frame_host.h" | 12 #include "content/public/browser/render_frame_host.h" |
13 #include "content/public/browser/render_view_host.h" | 13 #include "content/public/browser/render_view_host.h" |
14 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
15 #include "content/public/common/page_transition_types.h" | 15 #include "content/public/common/page_transition_types.h" |
16 #include "grit/generated_resources.h" | 16 #include "grit/generated_resources.h" |
17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
18 | 18 |
19 | 19 |
20 // static | 20 // static |
21 void InsecureContentInfoBarDelegate::Create(InfoBarService* infobar_service, | 21 void InsecureContentInfoBarDelegate::Create(InfoBarService* infobar_service, |
22 InfoBarType type) { | 22 InfoBarType type) { |
23 scoped_ptr<InfoBar> new_infobar(ConfirmInfoBarDelegate::CreateInfoBar( | 23 scoped_ptr<infobars::InfoBar> new_infobar( |
24 scoped_ptr<ConfirmInfoBarDelegate>( | 24 ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>( |
25 new InsecureContentInfoBarDelegate(type)))); | 25 new InsecureContentInfoBarDelegate(type)))); |
26 | 26 |
27 // Only supsersede an existing insecure content infobar if we are upgrading | 27 // Only supsersede an existing insecure content infobar if we are upgrading |
28 // from DISPLAY to RUN. | 28 // from DISPLAY to RUN. |
29 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { | 29 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { |
30 InfoBar* old_infobar = infobar_service->infobar_at(i); | 30 infobars::InfoBar* old_infobar = infobar_service->infobar_at(i); |
31 InsecureContentInfoBarDelegate* delegate = | 31 InsecureContentInfoBarDelegate* delegate = |
32 old_infobar->delegate()->AsInsecureContentInfoBarDelegate(); | 32 old_infobar->delegate()->AsInsecureContentInfoBarDelegate(); |
33 if (delegate != NULL) { | 33 if (delegate != NULL) { |
34 if ((type == RUN) && (delegate->type_ == DISPLAY)) | 34 if ((type == RUN) && (delegate->type_ == DISPLAY)) |
35 return; | 35 return; |
36 infobar_service->ReplaceInfoBar(old_infobar, new_infobar.Pass()); | 36 infobar_service->ReplaceInfoBar(old_infobar, new_infobar.Pass()); |
37 break; | 37 break; |
38 } | 38 } |
39 } | 39 } |
40 if (new_infobar.get()) | 40 if (new_infobar.get()) |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( | 112 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( |
113 content::OpenURLParams( | 113 content::OpenURLParams( |
114 google_util::AppendGoogleLocaleParam(GURL( | 114 google_util::AppendGoogleLocaleParam(GURL( |
115 "https://www.google.com/" | 115 "https://www.google.com/" |
116 "support/chrome/bin/answer.py?answer=1342714")), | 116 "support/chrome/bin/answer.py?answer=1342714")), |
117 content::Referrer(), | 117 content::Referrer(), |
118 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, | 118 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, |
119 content::PAGE_TRANSITION_LINK, false)); | 119 content::PAGE_TRANSITION_LINK, false)); |
120 return false; | 120 return false; |
121 } | 121 } |
OLD | NEW |