OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/ui/android/content_settings/popup_blocked_infobar_deleg
ate.h" | 5 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_deleg
ate.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/content_settings/host_content_settings_map.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map.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/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 11 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
13 #include "chrome/common/content_settings.h" | 12 #include "chrome/common/content_settings.h" |
14 #include "chrome/common/content_settings_types.h" | 13 #include "chrome/common/content_settings_types.h" |
| 14 #include "components/infobars/core/infobar.h" |
15 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
16 #include "grit/theme_resources.h" | 16 #include "grit/theme_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 PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents, | 21 void PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents, |
22 int num_popups) { | 22 int num_popups) { |
23 const GURL& url = web_contents->GetURL(); | 23 const GURL& url = web_contents->GetURL(); |
24 Profile* profile = | 24 Profile* profile = |
25 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | 25 Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
26 scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar( | 26 scoped_ptr<infobars::InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar( |
27 scoped_ptr<ConfirmInfoBarDelegate>( | 27 scoped_ptr<ConfirmInfoBarDelegate>(new PopupBlockedInfoBarDelegate( |
28 new PopupBlockedInfoBarDelegate( | 28 num_popups, url, profile->GetHostContentSettingsMap())))); |
29 num_popups, url, profile->GetHostContentSettingsMap())))); | |
30 | 29 |
31 InfoBarService* infobar_service = | 30 InfoBarService* infobar_service = |
32 InfoBarService::FromWebContents(web_contents); | 31 InfoBarService::FromWebContents(web_contents); |
33 // See if there is an existing popup infobar already. | 32 // See if there is an existing popup infobar already. |
34 // TODO(dfalcantara) When triggering more than one popup the infobar | 33 // TODO(dfalcantara) When triggering more than one popup the infobar |
35 // will be shown once, then hide then be shown again. | 34 // will be shown once, then hide then be shown again. |
36 // This will be fixed once we have an in place replace infobar mechanism. | 35 // This will be fixed once we have an in place replace infobar mechanism. |
37 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { | 36 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { |
38 InfoBar* existing_infobar = infobar_service->infobar_at(i); | 37 infobars::InfoBar* existing_infobar = infobar_service->infobar_at(i); |
39 if (existing_infobar->delegate()->AsPopupBlockedInfoBarDelegate()) { | 38 if (existing_infobar->delegate()->AsPopupBlockedInfoBarDelegate()) { |
40 infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass()); | 39 infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass()); |
41 return; | 40 return; |
42 } | 41 } |
43 } | 42 } |
44 | 43 |
45 infobar_service->AddInfoBar(infobar.Pass()); | 44 infobar_service->AddInfoBar(infobar.Pass()); |
46 } | 45 } |
47 | 46 |
48 PopupBlockedInfoBarDelegate::~PopupBlockedInfoBarDelegate() { | 47 PopupBlockedInfoBarDelegate::~PopupBlockedInfoBarDelegate() { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 DCHECK(popup_blocker_helper); | 105 DCHECK(popup_blocker_helper); |
107 PopupBlockerTabHelper::PopupIdMap blocked_popups = | 106 PopupBlockerTabHelper::PopupIdMap blocked_popups = |
108 popup_blocker_helper->GetBlockedPopupRequests(); | 107 popup_blocker_helper->GetBlockedPopupRequests(); |
109 for (PopupBlockerTabHelper::PopupIdMap::iterator it = blocked_popups.begin(); | 108 for (PopupBlockerTabHelper::PopupIdMap::iterator it = blocked_popups.begin(); |
110 it != blocked_popups.end(); ++it) | 109 it != blocked_popups.end(); ++it) |
111 popup_blocker_helper->ShowBlockedPopup(it->first); | 110 popup_blocker_helper->ShowBlockedPopup(it->first); |
112 | 111 |
113 return true; | 112 return true; |
114 } | 113 } |
115 | 114 |
OLD | NEW |