Index: chrome/browser/supervised_user/supervised_user_navigation_observer.h |
diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.h b/chrome/browser/supervised_user/supervised_user_navigation_observer.h |
similarity index 66% |
rename from chrome/browser/managed_mode/managed_mode_navigation_observer.h |
rename to chrome/browser/supervised_user/supervised_user_navigation_observer.h |
index 4a484d75b14afb61ce7b294d4c26168c6f0e00f3..f58944a286cde911e26af37d8c9a8cc3a3e21eae 100644 |
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.h |
+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.h |
@@ -2,20 +2,20 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_NAVIGATION_OBSERVER_H_ |
-#define CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_NAVIGATION_OBSERVER_H_ |
+#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_ |
+#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_ |
#include <set> |
#include <vector> |
#include "base/memory/scoped_vector.h" |
#include "base/values.h" |
-#include "chrome/browser/managed_mode/managed_users.h" |
+#include "chrome/browser/supervised_user/supervised_users.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "content/public/browser/web_contents_user_data.h" |
-class ManagedModeURLFilter; |
-class ManagedUserService; |
+class SupervisedUserService; |
+class SupervisedUserURLFilter; |
namespace content { |
class NavigationEntry; |
@@ -25,11 +25,11 @@ namespace infobars { |
class InfoBar; |
} |
-class ManagedModeNavigationObserver |
+class SupervisedUserNavigationObserver |
: public content::WebContentsObserver, |
- public content::WebContentsUserData<ManagedModeNavigationObserver> { |
+ public content::WebContentsUserData<SupervisedUserNavigationObserver> { |
public: |
- virtual ~ManagedModeNavigationObserver(); |
+ virtual ~SupervisedUserNavigationObserver(); |
// Sets the specific infobar as dismissed. |
void WarnInfoBarDismissed(); |
@@ -46,9 +46,9 @@ class ManagedModeNavigationObserver |
const base::Callback<void(bool)>& callback); |
private: |
- friend class content::WebContentsUserData<ManagedModeNavigationObserver>; |
+ friend class content::WebContentsUserData<SupervisedUserNavigationObserver>; |
- explicit ManagedModeNavigationObserver(content::WebContents* web_contents); |
+ explicit SupervisedUserNavigationObserver(content::WebContents* web_contents); |
// content::WebContentsObserver implementation. |
virtual void ProvisionalChangeToMainFrameUrl( |
@@ -65,17 +65,17 @@ class ManagedModeNavigationObserver |
void OnRequestBlockedInternal(const GURL& url); |
// Owned by the profile, so outlives us. |
- ManagedUserService* managed_user_service_; |
+ SupervisedUserService* supervised_user_service_; |
- // Owned by ManagedUserService. |
- const ManagedModeURLFilter* url_filter_; |
+ // Owned by SupervisedUserService. |
+ const SupervisedUserURLFilter* url_filter_; |
// Owned by the InfoBarService, which has the same lifetime as this object. |
infobars::InfoBar* warn_infobar_; |
ScopedVector<const content::NavigationEntry> blocked_navigations_; |
- DISALLOW_COPY_AND_ASSIGN(ManagedModeNavigationObserver); |
+ DISALLOW_COPY_AND_ASSIGN(SupervisedUserNavigationObserver); |
}; |
-#endif // CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_NAVIGATION_OBSERVER_H_ |
+#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_NAVIGATION_OBSERVER_H_ |