OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/managed_mode/managed_mode_interstitial.h" | 5 #include "chrome/browser/managed_mode/managed_mode_interstitial.h" |
6 | 6 |
7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 #include "chrome/browser/infobars/infobar.h" | 12 #include "chrome/browser/infobars/infobar.h" |
13 #include "chrome/browser/infobars/infobar_delegate.h" | 13 #include "chrome/browser/infobars/infobar_delegate.h" |
| 14 #include "chrome/browser/infobars/infobar_manager.h" |
14 #include "chrome/browser/infobars/infobar_service.h" | 15 #include "chrome/browser/infobars/infobar_service.h" |
15 #include "chrome/browser/managed_mode/managed_user_service.h" | 16 #include "chrome/browser/managed_mode/managed_user_service.h" |
16 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 17 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
17 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
19 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
20 #include "content/public/browser/interstitial_page.h" | 21 #include "content/public/browser/interstitial_page.h" |
21 #include "content/public/browser/navigation_controller.h" | 22 #include "content/public/browser/navigation_controller.h" |
22 #include "content/public/browser/navigation_details.h" | 23 #include "content/public/browser/navigation_details.h" |
23 #include "content/public/browser/navigation_entry.h" | 24 #include "content/public/browser/navigation_entry.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 // true. | 61 // true. |
61 DCHECK(details.is_navigation_to_different_page()); | 62 DCHECK(details.is_navigation_to_different_page()); |
62 const content::NavigationController& controller = | 63 const content::NavigationController& controller = |
63 web_contents->GetController(); | 64 web_contents->GetController(); |
64 details.entry = controller.GetActiveEntry(); | 65 details.entry = controller.GetActiveEntry(); |
65 if (controller.GetLastCommittedEntry()) { | 66 if (controller.GetLastCommittedEntry()) { |
66 details.previous_entry_index = controller.GetLastCommittedEntryIndex(); | 67 details.previous_entry_index = controller.GetLastCommittedEntryIndex(); |
67 details.previous_url = controller.GetLastCommittedEntry()->GetURL(); | 68 details.previous_url = controller.GetLastCommittedEntry()->GetURL(); |
68 } | 69 } |
69 details.type = content::NAVIGATION_TYPE_NEW_PAGE; | 70 details.type = content::NAVIGATION_TYPE_NEW_PAGE; |
70 for (int i = service->infobar_count() - 1; i >= 0; --i) { | 71 InfoBarManager& manager = service->infobar_manager(); |
71 if (service->infobar_at(i)->delegate()->ShouldExpire(details)) | 72 for (int i = manager.infobar_count() - 1; i >= 0; --i) { |
72 service->RemoveInfoBar(service->infobar_at(i)); | 73 if (manager.infobar_at(i)->delegate()->ShouldExpire( |
| 74 InfoBarService::NavigationDetailsFromLoadCommittedDetails( |
| 75 details))) |
| 76 manager.RemoveInfoBar(manager.infobar_at(i)); |
73 } | 77 } |
74 } | 78 } |
75 | 79 |
76 // TODO(bauerb): Extract an observer callback on ManagedUserService for this. | 80 // TODO(bauerb): Extract an observer callback on ManagedUserService for this. |
77 Profile* profile = | 81 Profile* profile = |
78 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | 82 Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
79 PrefService* prefs = profile->GetPrefs(); | 83 PrefService* prefs = profile->GetPrefs(); |
80 pref_change_registrar_.Init(prefs); | 84 pref_change_registrar_.Init(prefs); |
81 pref_change_registrar_.Add( | 85 pref_change_registrar_.Add( |
82 prefs::kDefaultManagedModeFilteringBehavior, | 86 prefs::kDefaultManagedModeFilteringBehavior, |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 | 205 |
202 void ManagedModeInterstitial::OnFilteringPrefsChanged() { | 206 void ManagedModeInterstitial::OnFilteringPrefsChanged() { |
203 if (ShouldProceed()) | 207 if (ShouldProceed()) |
204 interstitial_page_->Proceed(); | 208 interstitial_page_->Proceed(); |
205 } | 209 } |
206 | 210 |
207 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) { | 211 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) { |
208 BrowserThread::PostTask( | 212 BrowserThread::PostTask( |
209 BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request)); | 213 BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request)); |
210 } | 214 } |
OLD | NEW |