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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.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/toolbar/ToolbarTablet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
index 97e3ee18e24944c42c4c22b13aca5287230d5f84..99367fc21c134ee27a67bd68d08426bfdef7a187 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java
@@ -265,9 +265,9 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {
private void displayNavigationPopup(boolean isForward, View anchorView) {
Tab tab = getToolbarDataProvider().getTab();
- if (tab == null || tab.getNavigationHandler() == null) return;
- mNavigationPopup = new NavigationPopup(
- tab.getProfile(), getContext(), tab.getNavigationHandler(), isForward);
+ if (tab == null || tab.getWebContents() == null) return;
+ mNavigationPopup = new NavigationPopup(tab.getProfile(), getContext(),
+ tab.getWebContents().getNavigationController(), isForward);
mNavigationPopup.setAnchorView(anchorView);
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java ('k') | chrome/android/java_sources.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698