From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/weblayer/browser/navigation_controller_impl.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chromium/weblayer/browser/navigation_controller_impl.h') diff --git a/chromium/weblayer/browser/navigation_controller_impl.h b/chromium/weblayer/browser/navigation_controller_impl.h index 52dd02735cb..ce96e147504 100644 --- a/chromium/weblayer/browser/navigation_controller_impl.h +++ b/chromium/weblayer/browser/navigation_controller_impl.h @@ -9,6 +9,7 @@ #include #include "base/macros.h" +#include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "build/build_config.h" #include "content/public/browser/navigation_controller.h" @@ -64,6 +65,7 @@ class NavigationControllerImpl : public NavigationController, base::android::ScopedJavaLocalRef GetNavigationEntryTitle( JNIEnv* env, int index); + bool IsNavigationEntrySkippable(JNIEnv* env, int index); #endif private: @@ -90,6 +92,7 @@ class NavigationControllerImpl : public NavigationController, int GetNavigationListCurrentIndex() override; GURL GetNavigationEntryDisplayURL(int index) override; std::string GetNavigationEntryTitle(int index) override; + bool IsNavigationEntrySkippable(int index) override; // content::WebContentsObserver implementation: void DidStartNavigation( @@ -105,6 +108,7 @@ class NavigationControllerImpl : public NavigationController, void LoadProgressChanged(double progress) override; void DidFirstVisuallyNonEmptyPaint() override; + void OldPageNoLongerRendered(const GURL& url, bool success); void NotifyLoadStateChanged(); void DoNavigate( @@ -125,6 +129,8 @@ class NavigationControllerImpl : public NavigationController, base::android::ScopedJavaGlobalRef java_controller_; #endif + base::WeakPtrFactory weak_ptr_factory_{this}; + DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); }; -- cgit v1.2.1