OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/infobar_service.h" | 5 #include "chrome/browser/infobars/infobar_service.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/infobars/infobar.h" | |
10 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h" | 9 #include "chrome/browser/infobars/insecure_content_infobar_delegate.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/navigation_details.h" | 12 #include "content/public/browser/navigation_details.h" |
13 #include "content/public/browser/navigation_entry.h" | 13 #include "content/public/browser/navigation_entry.h" |
14 #include "content/public/browser/notification_service.h" | 14 #include "content/public/browser/notification_service.h" |
15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
16 | 16 |
17 DEFINE_WEB_CONTENTS_USER_DATA_KEY(InfoBarService); | 17 DEFINE_WEB_CONTENTS_USER_DATA_KEY(InfoBarService); |
18 | 18 |
| 19 using infobars::InfoBar; |
| 20 using infobars::InfoBarDelegate; |
| 21 using infobars::InfoBarManager; |
| 22 |
19 // static | 23 // static |
20 InfoBarDelegate::NavigationDetails | 24 InfoBarDelegate::NavigationDetails |
21 InfoBarService::NavigationDetailsFromLoadCommittedDetails( | 25 InfoBarService::NavigationDetailsFromLoadCommittedDetails( |
22 const content::LoadCommittedDetails& details) { | 26 const content::LoadCommittedDetails& details) { |
23 InfoBarDelegate::NavigationDetails navigation_details; | 27 InfoBarDelegate::NavigationDetails navigation_details; |
24 navigation_details.entry_id = details.entry->GetUniqueID(); | 28 navigation_details.entry_id = details.entry->GetUniqueID(); |
25 navigation_details.is_navigation_to_different_page = | 29 navigation_details.is_navigation_to_different_page = |
26 details.is_navigation_to_different_page(); | 30 details.is_navigation_to_different_page(); |
27 navigation_details.did_replace_entry = details.did_replace_entry; | 31 navigation_details.did_replace_entry = details.did_replace_entry; |
28 navigation_details.is_main_frame = details.is_main_frame; | 32 navigation_details.is_main_frame = details.is_main_frame; |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 | 130 |
127 void InfoBarService::OnDidBlockDisplayingInsecureContent() { | 131 void InfoBarService::OnDidBlockDisplayingInsecureContent() { |
128 InsecureContentInfoBarDelegate::Create( | 132 InsecureContentInfoBarDelegate::Create( |
129 this, InsecureContentInfoBarDelegate::DISPLAY); | 133 this, InsecureContentInfoBarDelegate::DISPLAY); |
130 } | 134 } |
131 | 135 |
132 void InfoBarService::OnDidBlockRunningInsecureContent() { | 136 void InfoBarService::OnDidBlockRunningInsecureContent() { |
133 InsecureContentInfoBarDelegate::Create(this, | 137 InsecureContentInfoBarDelegate::Create(this, |
134 InsecureContentInfoBarDelegate::RUN); | 138 InsecureContentInfoBarDelegate::RUN); |
135 } | 139 } |
OLD | NEW |