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

Side by Side Diff: content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java

Issue 577353002: [Android] Expose GetPendingEntry from NavigationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Comments Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.content.browser.framehost; 5 package org.chromium.content.browser.framehost;
6 6
7 import android.graphics.Bitmap; 7 import android.graphics.Bitmap;
8 8
9 import org.chromium.base.CalledByNative; 9 import org.chromium.base.CalledByNative;
10 import org.chromium.base.JNINamespace; 10 import org.chromium.base.JNINamespace;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 history, isForward, itemLimit); 173 history, isForward, itemLimit);
174 return history; 174 return history;
175 } 175 }
176 176
177 @Override 177 @Override
178 public String getOriginalUrlForVisibleNavigationEntry() { 178 public String getOriginalUrlForVisibleNavigationEntry() {
179 if (mNativeNavigationControllerAndroid == 0) return null; 179 if (mNativeNavigationControllerAndroid == 0) return null;
180 return nativeGetOriginalUrlForVisibleNavigationEntry(mNativeNavigationCo ntrollerAndroid); 180 return nativeGetOriginalUrlForVisibleNavigationEntry(mNativeNavigationCo ntrollerAndroid);
181 } 181 }
182 182
183 @CalledByNative
184 private void addToNavigationHistory(Object history, int index, String url,
185 String virtualUrl,String originalUrl, String title, Bitmap favicon ) {
186 NavigationEntry entry = new NavigationEntry(index, url, virtualUrl,
187 originalUrl, title, favicon);
188 ((NavigationHistory) history).addEntry(entry);
189 }
190
191 @Override 183 @Override
192 public void clearSslPreferences() { 184 public void clearSslPreferences() {
193 if (mNativeNavigationControllerAndroid != 0) { 185 if (mNativeNavigationControllerAndroid != 0) {
194 nativeClearSslPreferences(mNativeNavigationControllerAndroid); 186 nativeClearSslPreferences(mNativeNavigationControllerAndroid);
195 } 187 }
196 } 188 }
197 189
198 @Override 190 @Override
199 public boolean getUseDesktopUserAgent() { 191 public boolean getUseDesktopUserAgent() {
200 if (mNativeNavigationControllerAndroid == 0) return false; 192 if (mNativeNavigationControllerAndroid == 0) return false;
201 return nativeGetUseDesktopUserAgent(mNativeNavigationControllerAndroid); 193 return nativeGetUseDesktopUserAgent(mNativeNavigationControllerAndroid);
202 } 194 }
203 195
204 @Override 196 @Override
205 public void setUseDesktopUserAgent(boolean override, boolean reloadOnChange) { 197 public void setUseDesktopUserAgent(boolean override, boolean reloadOnChange) {
206 if (mNativeNavigationControllerAndroid != 0) { 198 if (mNativeNavigationControllerAndroid != 0) {
207 nativeSetUseDesktopUserAgent(mNativeNavigationControllerAndroid, 199 nativeSetUseDesktopUserAgent(mNativeNavigationControllerAndroid,
208 override, reloadOnChange); 200 override, reloadOnChange);
209 } 201 }
210 } 202 }
211 203
204 @Override
205 public NavigationEntry getPendingEntry() {
206 if (mNativeNavigationControllerAndroid != 0) {
207 return nativeGetPendingEntry(mNativeNavigationControllerAndroid);
208 }
209
210 return null;
211 }
212
213 @CalledByNative
214 private static void addToNavigationHistory(Object history, Object navigation Entry) {
215 ((NavigationHistory) history).addEntry((NavigationEntry) navigationEntry );
216 }
217
218 @CalledByNative
219 private static NavigationEntry createNavigationEntry(int index, String url,
220 String virtualUrl, String originalUrl, String title, Bitmap favicon) {
221 return new NavigationEntry(index, url, virtualUrl, originalUrl, title, f avicon);
222 }
223
212 private native boolean nativeCanGoBack(long nativeNavigationControllerAndroi d); 224 private native boolean nativeCanGoBack(long nativeNavigationControllerAndroi d);
213 private native boolean nativeCanGoForward(long nativeNavigationControllerAnd roid); 225 private native boolean nativeCanGoForward(long nativeNavigationControllerAnd roid);
214 private native void nativeLoadIfNecessary(long nativeNavigationControllerAnd roid); 226 private native void nativeLoadIfNecessary(long nativeNavigationControllerAnd roid);
215 private native void nativeRequestRestoreLoad(long nativeNavigationController Android); 227 private native void nativeRequestRestoreLoad(long nativeNavigationController Android);
216 private native boolean nativeCanGoToOffset( 228 private native boolean nativeCanGoToOffset(
217 long nativeNavigationControllerAndroid, int offset); 229 long nativeNavigationControllerAndroid, int offset);
218 private native void nativeGoBack(long nativeNavigationControllerAndroid); 230 private native void nativeGoBack(long nativeNavigationControllerAndroid);
219 private native void nativeGoForward(long nativeNavigationControllerAndroid); 231 private native void nativeGoForward(long nativeNavigationControllerAndroid);
220 private native void nativeGoToOffset(long nativeNavigationControllerAndroid, int offset); 232 private native void nativeGoToOffset(long nativeNavigationControllerAndroid, int offset);
221 private native void nativeGoToNavigationIndex( 233 private native void nativeGoToNavigationIndex(
(...skipping 22 matching lines...) Expand all
244 private native int nativeGetNavigationHistory(long nativeNavigationControlle rAndroid, 256 private native int nativeGetNavigationHistory(long nativeNavigationControlle rAndroid,
245 Object history); 257 Object history);
246 private native void nativeGetDirectedNavigationHistory(long nativeNavigation ControllerAndroid, 258 private native void nativeGetDirectedNavigationHistory(long nativeNavigation ControllerAndroid,
247 NavigationHistory history, boolean isForward, int itemLimit); 259 NavigationHistory history, boolean isForward, int itemLimit);
248 private native String nativeGetOriginalUrlForVisibleNavigationEntry( 260 private native String nativeGetOriginalUrlForVisibleNavigationEntry(
249 long nativeNavigationControllerAndroid); 261 long nativeNavigationControllerAndroid);
250 private native void nativeClearSslPreferences(long nativeNavigationControlle rAndroid); 262 private native void nativeClearSslPreferences(long nativeNavigationControlle rAndroid);
251 private native boolean nativeGetUseDesktopUserAgent(long nativeNavigationCon trollerAndroid); 263 private native boolean nativeGetUseDesktopUserAgent(long nativeNavigationCon trollerAndroid);
252 private native void nativeSetUseDesktopUserAgent(long nativeNavigationContro llerAndroid, 264 private native void nativeSetUseDesktopUserAgent(long nativeNavigationContro llerAndroid,
253 boolean override, boolean reloadOnChange); 265 boolean override, boolean reloadOnChange);
266 private native NavigationEntry nativeGetPendingEntry(long nativeNavigationCo ntrollerAndroid);
254 } 267 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698