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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java

Issue 2235533002: Revert "Changed NavigationController access to through tab in Java code" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
index 400b4f657950d8bb0c9ce6e573c704d8254a2d4f..45677771637fefaf3e6e47a06ad38f1d6d105bd1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java
@@ -11,7 +11,6 @@ import org.chromium.base.TraceEvent;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.chrome.R;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.OverscrollRefreshHandler;
import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
@@ -70,8 +69,7 @@ public class SwipeRefreshHandler implements OverscrollRefreshHandler {
* the effect will be disabled.
* @param contentViewCore The associated ContentViewCore instance.
*/
- public void setContentViewCore(final ContentViewCore contentViewCore,
- final NavigationHandler navigationHandler) {
+ public void setContentViewCore(final ContentViewCore contentViewCore) {
if (mContentViewCore == contentViewCore) return;
if (mContentViewCore != null) {
@@ -98,7 +96,8 @@ public class SwipeRefreshHandler implements OverscrollRefreshHandler {
contentViewCore.getContext().getResources().getString(resId);
}
mSwipeRefreshLayout.announceForAccessibility(mAccessibilityRefreshString);
- navigationHandler.reloadToRefreshContent(true);
+ contentViewCore.getWebContents().getNavigationController().reloadToRefreshContent(
+ true);
RecordUserAction.record("MobilePullGestureReload");
}
});

Powered by Google App Engine
This is Rietveld 408576698