Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/browser/managed_mode/managed_mode_interstitial.cc

Issue 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + comments Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 21 matching lines...) Expand all
45 // It can happen that the site was only allowed very recently and the URL 46 // It can happen that the site was only allowed very recently and the URL
46 // filter on the IO thread had not been updated yet. Proceed with the 47 // filter on the IO thread had not been updated yet. Proceed with the
47 // request without showing the interstitial. 48 // request without showing the interstitial.
48 DispatchContinueRequest(true); 49 DispatchContinueRequest(true);
49 delete this; 50 delete this;
50 return; 51 return;
51 } 52 }
52 53
53 InfoBarService* service = InfoBarService::FromWebContents(web_contents); 54 InfoBarService* service = InfoBarService::FromWebContents(web_contents);
54 if (service) { 55 if (service) {
56 InfoBarManager* infobar_manager = service->infobar_manager();
55 // Remove all the infobars which are attached to |web_contents| and for 57 // Remove all the infobars which are attached to |web_contents| and for
56 // which ShouldExpire() returns true. 58 // which ShouldExpire() returns true.
57 content::LoadCommittedDetails details; 59 content::LoadCommittedDetails details;
58 // |details.is_in_page| is default false, and |details.is_main_frame| is 60 // |details.is_in_page| is default false, and |details.is_main_frame| is
59 // default true. This results in is_navigation_to_different_page() returning 61 // default true. This results in is_navigation_to_different_page() returning
60 // true. 62 // true.
61 DCHECK(details.is_navigation_to_different_page()); 63 DCHECK(details.is_navigation_to_different_page());
62 const content::NavigationController& controller = 64 const content::NavigationController& controller =
63 web_contents->GetController(); 65 web_contents->GetController();
64 details.entry = controller.GetActiveEntry(); 66 details.entry = controller.GetActiveEntry();
65 if (controller.GetLastCommittedEntry()) { 67 if (controller.GetLastCommittedEntry()) {
66 details.previous_entry_index = controller.GetLastCommittedEntryIndex(); 68 details.previous_entry_index = controller.GetLastCommittedEntryIndex();
67 details.previous_url = controller.GetLastCommittedEntry()->GetURL(); 69 details.previous_url = controller.GetLastCommittedEntry()->GetURL();
68 } 70 }
69 details.type = content::NAVIGATION_TYPE_NEW_PAGE; 71 details.type = content::NAVIGATION_TYPE_NEW_PAGE;
70 for (int i = service->infobar_count() - 1; i >= 0; --i) { 72 for (int i = infobar_manager->infobar_count() - 1; i >= 0; --i) {
71 if (service->infobar_at(i)->delegate()->ShouldExpire(details)) 73 if (infobar_manager->infobar_at(i)->delegate()->ShouldExpire(details))
72 service->RemoveInfoBar(service->infobar_at(i)); 74 infobar_manager->RemoveInfoBar(infobar_manager->infobar_at(i));
73 } 75 }
74 } 76 }
75 77
76 // TODO(bauerb): Extract an observer callback on ManagedUserService for this. 78 // TODO(bauerb): Extract an observer callback on ManagedUserService for this.
77 Profile* profile = 79 Profile* profile =
78 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 80 Profile::FromBrowserContext(web_contents->GetBrowserContext());
79 PrefService* prefs = profile->GetPrefs(); 81 PrefService* prefs = profile->GetPrefs();
80 pref_change_registrar_.Init(prefs); 82 pref_change_registrar_.Init(prefs);
81 pref_change_registrar_.Add( 83 pref_change_registrar_.Add(
82 prefs::kDefaultManagedModeFilteringBehavior, 84 prefs::kDefaultManagedModeFilteringBehavior,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 203
202 void ManagedModeInterstitial::OnFilteringPrefsChanged() { 204 void ManagedModeInterstitial::OnFilteringPrefsChanged() {
203 if (ShouldProceed()) 205 if (ShouldProceed())
204 interstitial_page_->Proceed(); 206 interstitial_page_->Proceed();
205 } 207 }
206 208
207 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) { 209 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) {
208 BrowserThread::PostTask( 210 BrowserThread::PostTask(
209 BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request)); 211 BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request));
210 } 212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698