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 1ddd4953e9a79fb2549b6c5dd43ccf931b6df305..2127f8b57107ae4f6a4bca9fd2968147dd83f30a 100644 |
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.h |
+++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.h |
@@ -69,8 +69,6 @@ class ManagedModeNavigationObserver |
// an interstitial for this RenderView. This allows the user to navigate |
// around on the website after clicking preview. |
void AddTemporaryException(); |
- // Updates the ResourceThrottle with the latest user navigation status. |
- void UpdateExceptionNavigationStatus(); |
void RemoveTemporaryException(); |
void AddURLToPatternList(const GURL& url); |
@@ -102,7 +100,6 @@ class ManagedModeNavigationObserver |
const GURL& url, |
content::PageTransition transition_type, |
content::RenderViewHost* render_view_host) OVERRIDE; |
- virtual void DidGetUserGesture() OVERRIDE; |
// Returns whether the user would stay in elevated state if he visits this |
// URL. |
@@ -118,12 +115,6 @@ class ManagedModeNavigationObserver |
InfoBarDelegate* warn_infobar_delegate_; |
InfoBarDelegate* preview_infobar_delegate_; |
- // Whether we received a user gesture. |
- // The goal is to allow automatic redirects (in order not to break the flow |
- // or show too many interstitials) while not allowing the user to navigate |
- // to blocked pages. We consider a redirect to be automatic if we did |
- // not get a user gesture. |
- bool got_user_gesture_; |
ObserverState state_; |
std::set<GURL> navigated_urls_; |
GURL last_url_; |
@@ -134,6 +125,16 @@ class ManagedModeNavigationObserver |
int last_allowed_page_; |
+ // There are two starting points for a new navigation: |
+ // 1. NavigateToPendingEntry when the omnibox is used to navigate to a URL or |
+ // the user goes back or forward. |
+ // 2. ProvisionalChangeToMainFrameURL when the user clicks on a link. |
+ // The main problem is that ProvisionalChangeToMainFrameURL is called for |
+ // redirects as well and we need a way to distinguish between the two |
+ // scenarios. |finished_redirects_| helps us do that by tracking the cases |
+ // when the user did not click on a URL. |
+ bool finished_redirects_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ManagedModeNavigationObserver); |
}; |