Commit ccd9f529 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Remove JavaScriptDialogTabHelper's use of DidStartNavigationToPendingEntry.

BUG=817024

Change-Id: I60d8e6b269c0c8f565e689508789713f73703e2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1729470Reviewed-by: default avatarLeonard Grey <lgrey@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682878}
parent 0fb1097e
...@@ -419,16 +419,6 @@ void JavaScriptDialogTabHelper::DidStartNavigation( ...@@ -419,16 +419,6 @@ void JavaScriptDialogTabHelper::DidStartNavigation(
CloseDialog(DismissalCause::kTabNavigated, false, base::string16()); CloseDialog(DismissalCause::kTabNavigated, false, base::string16());
} }
// TODO(avi): Remove this function since it is deprecated at the
// WebContentsObserver level.
void JavaScriptDialogTabHelper::DidStartNavigationToPendingEntry(
const GURL& url,
content::ReloadType reload_type) {
// Close the dialog if the user started a new navigation. This allows reloads
// and history navigations to proceed.
CloseDialog(DismissalCause::kTabNavigated, false, base::string16());
}
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
void JavaScriptDialogTabHelper::OnBrowserSetLastActive(Browser* browser) { void JavaScriptDialogTabHelper::OnBrowserSetLastActive(Browser* browser) {
if (IsWebContentsForemost(web_contents())) { if (IsWebContentsForemost(web_contents())) {
......
...@@ -126,9 +126,6 @@ class JavaScriptDialogTabHelper ...@@ -126,9 +126,6 @@ class JavaScriptDialogTabHelper
void OnVisibilityChanged(content::Visibility visibility) override; void OnVisibilityChanged(content::Visibility visibility) override;
void DidStartNavigation( void DidStartNavigation(
content::NavigationHandle* navigation_handle) override; content::NavigationHandle* navigation_handle) override;
void DidStartNavigationToPendingEntry(
const GURL& url,
content::ReloadType reload_type) override;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// BrowserListObserver: // BrowserListObserver:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment