Index: chrome/browser/managed_mode/managed_mode_navigation_observer.cc |
diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc |
index dd17b0f75300ae42449655404d1cb3d48d8de4d0..8520e6dc515f16266cdfd6ccddb0edeb47be686c 100644 |
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc |
+++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc |
@@ -14,6 +14,8 @@ |
#include "chrome/browser/managed_mode/managed_mode_interstitial.h" |
#include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" |
#include "chrome/browser/managed_mode/managed_mode_url_filter.h" |
+#include "chrome/browser/managed_mode/managed_user_service.h" |
+#include "chrome/browser/managed_mode/managed_user_service_factory.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/browser.h" |
@@ -231,11 +233,15 @@ ManagedModeNavigationObserver::~ManagedModeNavigationObserver() { |
ManagedModeNavigationObserver::ManagedModeNavigationObserver( |
content::WebContents* web_contents) |
: WebContentsObserver(web_contents), |
- url_filter_(ManagedMode::GetURLFilterForUIThread()), |
warn_infobar_delegate_(NULL), |
preview_infobar_delegate_(NULL), |
state_(RECORDING_URLS_BEFORE_PREVIEW), |
- last_allowed_page_(-1) {} |
+ last_allowed_page_(-1) { |
+ Profile* profile = |
+ Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
+ managed_user_service_ = ManagedUserServiceFactory::GetForProfile(profile); |
+ url_filter_ = managed_user_service_->GetURLFilterForUIThread(); |
+} |
void ManagedModeNavigationObserver::AddTemporaryException() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -289,7 +295,7 @@ void ManagedModeNavigationObserver::AddSavedURLsToWhitelistAndClearState() { |
whitelist.AppendString(last_url_.host()); |
} |
} |
- ManagedMode::AddToManualList(true, whitelist); |
+ managed_user_service_->AddToManualList(true, whitelist); |
ClearObserverState(); |
} |
@@ -386,18 +392,6 @@ void ManagedModeNavigationObserver::DidNavigateMainFrame( |
} |
} |
-void ManagedModeNavigationObserver::DidStartProvisionalLoadForFrame( |
- int64 frame_id, |
- int64 parent_frame_id, |
- bool is_main_frame, |
- const GURL& validated_url, |
- bool is_error_page, |
- bool is_iframe_srcdoc, |
- content::RenderViewHost* render_view_host) { |
- if (!is_main_frame) |
- return; |
-} |
- |
void ManagedModeNavigationObserver::ProvisionalChangeToMainFrameUrl( |
const GURL& url, |
content::RenderViewHost* render_view_host) { |