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

Unified Diff: chrome/browser/managed_mode/managed_mode_navigation_observer.h

Issue 11826059: Add ManagedUserService for profile-specific managed user data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android test Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/managed_mode/managed_mode_navigation_observer.h
diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.h b/chrome/browser/managed_mode/managed_mode_navigation_observer.h
index 53ab1c9b5a24d751cd0ed4b81703d1cb7f9ac144..1b3ce25ebb9069ce27b1609c80e28dfdb6544957 100644
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.h
+++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.h
@@ -13,6 +13,7 @@
class InfoBarDelegate;
class ManagedModeURLFilter;
+class ManagedUserService;
class ManagedModeNavigationObserver
: public content::WebContentsObserver,
@@ -75,7 +76,6 @@ class ManagedModeNavigationObserver
// google.com in our case is as follows:
// 1. User types in google.com and clicks enter.
// -> NavigateToPendingEntry: http://google.com
- // -> DidStartProvisionalLoadForFrame http://google.com
// -> ProvisionalChangeToMainFrameUrl http://google.com
// 2. Interstitial is shown to the user. User clicks "Preview".
// -> ProvisionalChangeToMainFrameUrl http://www.google.com (redirect)
@@ -88,14 +88,6 @@ class ManagedModeNavigationObserver
virtual void DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) OVERRIDE;
- virtual void DidStartProvisionalLoadForFrame(
Pam (message me for reviews) 2013/01/14 14:12:42 OK, but not really related to this change?
Bernhard Bauer 2013/01/15 14:24:44 Hm, fair enough. Removed.
- 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) OVERRIDE;
virtual void ProvisionalChangeToMainFrameUrl(
const GURL& url,
content::RenderViewHost* render_view_host) OVERRIDE;
@@ -106,7 +98,10 @@ class ManagedModeNavigationObserver
content::PageTransition transition_type,
content::RenderViewHost* render_view_host) OVERRIDE;
- // Owned by ManagedMode (which is a singleton and outlives us).
+ // Owned by the profile, so outlives us.
+ ManagedUserService* managed_user_service_;
+
+ // Owned by ManagedUserService.
const ManagedModeURLFilter* url_filter_;
// Owned by the InfoBarService, which has the same lifetime as this object.

Powered by Google App Engine
This is Rietveld 408576698