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" | |
13 #include "chrome/browser/infobars/infobar_delegate.h" | |
14 #include "chrome/browser/infobars/infobar_service.h" | 12 #include "chrome/browser/infobars/infobar_service.h" |
15 #include "chrome/browser/managed_mode/managed_user_service.h" | 13 #include "chrome/browser/managed_mode/managed_user_service.h" |
16 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 14 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
17 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 17 #include "components/infobars/core/infobar.h" |
| 18 #include "components/infobars/core/infobar_delegate.h" |
19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
20 #include "content/public/browser/interstitial_page.h" | 20 #include "content/public/browser/interstitial_page.h" |
21 #include "content/public/browser/navigation_controller.h" | 21 #include "content/public/browser/navigation_controller.h" |
22 #include "content/public/browser/navigation_details.h" | 22 #include "content/public/browser/navigation_details.h" |
23 #include "content/public/browser/navigation_entry.h" | 23 #include "content/public/browser/navigation_entry.h" |
24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
25 #include "content/public/browser/web_ui.h" | 25 #include "content/public/browser/web_ui.h" |
26 #include "grit/browser_resources.h" | 26 #include "grit/browser_resources.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "net/base/net_util.h" | 28 #include "net/base/net_util.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 DCHECK(details.is_navigation_to_different_page()); | 61 DCHECK(details.is_navigation_to_different_page()); |
62 const content::NavigationController& controller = | 62 const content::NavigationController& controller = |
63 web_contents->GetController(); | 63 web_contents->GetController(); |
64 details.entry = controller.GetActiveEntry(); | 64 details.entry = controller.GetActiveEntry(); |
65 if (controller.GetLastCommittedEntry()) { | 65 if (controller.GetLastCommittedEntry()) { |
66 details.previous_entry_index = controller.GetLastCommittedEntryIndex(); | 66 details.previous_entry_index = controller.GetLastCommittedEntryIndex(); |
67 details.previous_url = controller.GetLastCommittedEntry()->GetURL(); | 67 details.previous_url = controller.GetLastCommittedEntry()->GetURL(); |
68 } | 68 } |
69 details.type = content::NAVIGATION_TYPE_NEW_PAGE; | 69 details.type = content::NAVIGATION_TYPE_NEW_PAGE; |
70 for (int i = service->infobar_count() - 1; i >= 0; --i) { | 70 for (int i = service->infobar_count() - 1; i >= 0; --i) { |
71 InfoBar* infobar = service->infobar_at(i); | 71 infobars::InfoBar* infobar = service->infobar_at(i); |
72 if (infobar->delegate()->ShouldExpire( | 72 if (infobar->delegate()->ShouldExpire( |
73 InfoBarService::NavigationDetailsFromLoadCommittedDetails( | 73 InfoBarService::NavigationDetailsFromLoadCommittedDetails( |
74 details))) | 74 details))) |
75 service->RemoveInfoBar(infobar); | 75 service->RemoveInfoBar(infobar); |
76 } | 76 } |
77 } | 77 } |
78 | 78 |
79 // TODO(bauerb): Extract an observer callback on ManagedUserService for this. | 79 // TODO(bauerb): Extract an observer callback on ManagedUserService for this. |
80 Profile* profile = | 80 Profile* profile = |
81 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | 81 Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 | 204 |
205 void ManagedModeInterstitial::OnFilteringPrefsChanged() { | 205 void ManagedModeInterstitial::OnFilteringPrefsChanged() { |
206 if (ShouldProceed()) | 206 if (ShouldProceed()) |
207 interstitial_page_->Proceed(); | 207 interstitial_page_->Proceed(); |
208 } | 208 } |
209 | 209 |
210 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) { | 210 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) { |
211 BrowserThread::PostTask( | 211 BrowserThread::PostTask( |
212 BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request)); | 212 BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request)); |
213 } | 213 } |
OLD | NEW |