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/infobars/infobar_service.h" | 8 #include "chrome/browser/infobars/infobar_service.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 10 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
11 #include "chrome/grit/generated_resources.h" | 11 #include "chrome/grit/generated_resources.h" |
12 #include "components/content_settings/core/browser/host_content_settings_map.h" | 12 #include "components/content_settings/core/browser/host_content_settings_map.h" |
13 #include "components/content_settings/core/common/content_settings.h" | 13 #include "components/content_settings/core/common/content_settings.h" |
14 #include "components/content_settings/core/common/content_settings_types.h" | 14 #include "components/content_settings/core/common/content_settings_types.h" |
15 #include "components/infobars/core/infobar.h" | 15 #include "components/infobars/core/infobar.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<infobars::InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar( | 26 InfoBarService* infobar_service = |
| 27 InfoBarService::FromWebContents(web_contents); |
| 28 scoped_ptr<infobars::InfoBar> infobar(infobar_service->CreateConfirmInfoBar( |
27 scoped_ptr<ConfirmInfoBarDelegate>(new PopupBlockedInfoBarDelegate( | 29 scoped_ptr<ConfirmInfoBarDelegate>(new PopupBlockedInfoBarDelegate( |
28 num_popups, url, profile->GetHostContentSettingsMap())))); | 30 num_popups, url, profile->GetHostContentSettingsMap())))); |
29 | 31 |
30 InfoBarService* infobar_service = | |
31 InfoBarService::FromWebContents(web_contents); | |
32 // See if there is an existing popup infobar already. | 32 // See if there is an existing popup infobar already. |
33 // TODO(dfalcantara) When triggering more than one popup the infobar | 33 // TODO(dfalcantara) When triggering more than one popup the infobar |
34 // will be shown once, then hide then be shown again. | 34 // will be shown once, then hide then be shown again. |
35 // 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. |
36 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { | 36 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { |
37 infobars::InfoBar* existing_infobar = infobar_service->infobar_at(i); | 37 infobars::InfoBar* existing_infobar = infobar_service->infobar_at(i); |
38 if (existing_infobar->delegate()->AsPopupBlockedInfoBarDelegate()) { | 38 if (existing_infobar->delegate()->AsPopupBlockedInfoBarDelegate()) { |
39 infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass()); | 39 infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass()); |
40 return; | 40 return; |
41 } | 41 } |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 PopupBlockerTabHelper::FromWebContents(web_contents); | 99 PopupBlockerTabHelper::FromWebContents(web_contents); |
100 DCHECK(popup_blocker_helper); | 100 DCHECK(popup_blocker_helper); |
101 PopupBlockerTabHelper::PopupIdMap blocked_popups = | 101 PopupBlockerTabHelper::PopupIdMap blocked_popups = |
102 popup_blocker_helper->GetBlockedPopupRequests(); | 102 popup_blocker_helper->GetBlockedPopupRequests(); |
103 for (PopupBlockerTabHelper::PopupIdMap::iterator it = blocked_popups.begin(); | 103 for (PopupBlockerTabHelper::PopupIdMap::iterator it = blocked_popups.begin(); |
104 it != blocked_popups.end(); ++it) | 104 it != blocked_popups.end(); ++it) |
105 popup_blocker_helper->ShowBlockedPopup(it->first); | 105 popup_blocker_helper->ShowBlockedPopup(it->first); |
106 | 106 |
107 return true; | 107 return true; |
108 } | 108 } |
OLD | NEW |