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

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

Issue 1024103002: [Android WebView] Provide user-initiated provisional load detection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments and build fix Created 5 years, 9 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 return false; 241 return false;
242 } 242 }
243 243
244 @CalledByNative 244 @CalledByNative
245 private static void addToNavigationHistory(Object history, Object navigation Entry) { 245 private static void addToNavigationHistory(Object history, Object navigation Entry) {
246 ((NavigationHistory) history).addEntry((NavigationEntry) navigationEntry ); 246 ((NavigationHistory) history).addEntry((NavigationEntry) navigationEntry );
247 } 247 }
248 248
249 @CalledByNative 249 @CalledByNative
250 private static NavigationEntry createNavigationEntry(int index, String url, 250 private static NavigationEntry createNavigationEntry(int index, String url,
251 String virtualUrl, String originalUrl, String title, Bitmap favicon) { 251 String virtualUrl, String originalUrl, String title, Bitmap favicon, int transition) {
252 return new NavigationEntry(index, url, virtualUrl, originalUrl, title, f avicon); 252 return new NavigationEntry(index, url, virtualUrl, originalUrl, title, f avicon, transition);
253 } 253 }
254 254
255 private native boolean nativeCanGoBack(long nativeNavigationControllerAndroi d); 255 private native boolean nativeCanGoBack(long nativeNavigationControllerAndroi d);
256 private native boolean nativeCanGoForward(long nativeNavigationControllerAnd roid); 256 private native boolean nativeCanGoForward(long nativeNavigationControllerAnd roid);
257 private native boolean nativeIsInitialNavigation(long nativeNavigationContro llerAndroid); 257 private native boolean nativeIsInitialNavigation(long nativeNavigationContro llerAndroid);
258 private native void nativeLoadIfNecessary(long nativeNavigationControllerAnd roid); 258 private native void nativeLoadIfNecessary(long nativeNavigationControllerAnd roid);
259 private native void nativeRequestRestoreLoad(long nativeNavigationController Android); 259 private native void nativeRequestRestoreLoad(long nativeNavigationController Android);
260 private native boolean nativeCanGoToOffset( 260 private native boolean nativeCanGoToOffset(
261 long nativeNavigationControllerAndroid, int offset); 261 long nativeNavigationControllerAndroid, int offset);
262 private native void nativeGoBack(long nativeNavigationControllerAndroid); 262 private native void nativeGoBack(long nativeNavigationControllerAndroid);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 private native boolean nativeGetUseDesktopUserAgent(long nativeNavigationCon trollerAndroid); 295 private native boolean nativeGetUseDesktopUserAgent(long nativeNavigationCon trollerAndroid);
296 private native void nativeSetUseDesktopUserAgent(long nativeNavigationContro llerAndroid, 296 private native void nativeSetUseDesktopUserAgent(long nativeNavigationContro llerAndroid,
297 boolean override, boolean reloadOnChange); 297 boolean override, boolean reloadOnChange);
298 private native NavigationEntry nativeGetEntryAtIndex( 298 private native NavigationEntry nativeGetEntryAtIndex(
299 long nativeNavigationControllerAndroid, int index); 299 long nativeNavigationControllerAndroid, int index);
300 private native NavigationEntry nativeGetPendingEntry(long nativeNavigationCo ntrollerAndroid); 300 private native NavigationEntry nativeGetPendingEntry(long nativeNavigationCo ntrollerAndroid);
301 private native int nativeGetLastCommittedEntryIndex(long nativeNavigationCon trollerAndroid); 301 private native int nativeGetLastCommittedEntryIndex(long nativeNavigationCon trollerAndroid);
302 private native boolean nativeRemoveEntryAtIndex(long nativeNavigationControl lerAndroid, 302 private native boolean nativeRemoveEntryAtIndex(long nativeNavigationControl lerAndroid,
303 int index); 303 int index);
304 } 304 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698