| Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
|
| index 00747ae83a28b6df8ec41180bdf4824246b75c58..d0179e9fd0605fc84852a0c62152ead7ca5945f2 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
|
| @@ -156,7 +156,7 @@ public class ChromeBrowserProvider extends ContentProvider {
|
| private final Object mLoadNativeLock = new Object();
|
| private UriMatcher mUriMatcher;
|
| private long mLastModifiedBookmarkFolderId = INVALID_BOOKMARK_ID;
|
| - private int mNativeChromeBrowserProvider;
|
| + private long mNativeChromeBrowserProvider;
|
| private BookmarkNode mMobileBookmarksFolder;
|
|
|
| /**
|
| @@ -1285,66 +1285,66 @@ public class ChromeBrowserProvider extends ContentProvider {
|
| context, url, title, favicon, rValue, gValue, bValue);
|
| }
|
|
|
| - private native int nativeInit();
|
| - private native void nativeDestroy(int nativeChromeBrowserProvider);
|
| + private native long nativeInit();
|
| + private native void nativeDestroy(long nativeChromeBrowserProvider);
|
|
|
| // Public API native methods.
|
| - private native long nativeAddBookmark(int nativeChromeBrowserProvider,
|
| + private native long nativeAddBookmark(long nativeChromeBrowserProvider,
|
| String url, String title, boolean isFolder, long parentId);
|
|
|
| - private native int nativeRemoveBookmark(int nativeChromeBrowserProvider, long id);
|
| + private native int nativeRemoveBookmark(long nativeChromeBrowserProvider, long id);
|
|
|
| - private native int nativeUpdateBookmark(int nativeChromeBrowserProvider,
|
| + private native int nativeUpdateBookmark(long nativeChromeBrowserProvider,
|
| long id, String url, String title, long parentId);
|
|
|
| - private native long nativeAddBookmarkFromAPI(int nativeChromeBrowserProvider,
|
| + private native long nativeAddBookmarkFromAPI(long nativeChromeBrowserProvider,
|
| String url, Long created, Boolean isBookmark, Long date, byte[] favicon,
|
| String title, Integer visits, long parentId);
|
|
|
| - private native SQLiteCursor nativeQueryBookmarkFromAPI(int nativeChromeBrowserProvider,
|
| + private native SQLiteCursor nativeQueryBookmarkFromAPI(long nativeChromeBrowserProvider,
|
| String[] projection, String selection, String[] selectionArgs, String sortOrder);
|
|
|
| - private native int nativeUpdateBookmarkFromAPI(int nativeChromeBrowserProvider,
|
| + private native int nativeUpdateBookmarkFromAPI(long nativeChromeBrowserProvider,
|
| String url, Long created, Boolean isBookmark, Long date, byte[] favicon,
|
| String title, Integer visits, long parentId, String selection, String[] selectionArgs);
|
|
|
| - private native int nativeRemoveBookmarkFromAPI(int nativeChromeBrowserProvider,
|
| + private native int nativeRemoveBookmarkFromAPI(long nativeChromeBrowserProvider,
|
| String selection, String[] selectionArgs);
|
|
|
| - private native int nativeRemoveHistoryFromAPI(int nativeChromeBrowserProvider,
|
| + private native int nativeRemoveHistoryFromAPI(long nativeChromeBrowserProvider,
|
| String selection, String[] selectionArgs);
|
|
|
| - private native long nativeAddSearchTermFromAPI(int nativeChromeBrowserProvider,
|
| + private native long nativeAddSearchTermFromAPI(long nativeChromeBrowserProvider,
|
| String term, Long date);
|
|
|
| - private native SQLiteCursor nativeQuerySearchTermFromAPI(int nativeChromeBrowserProvider,
|
| + private native SQLiteCursor nativeQuerySearchTermFromAPI(long nativeChromeBrowserProvider,
|
| String[] projection, String selection, String[] selectionArgs, String sortOrder);
|
|
|
| - private native int nativeUpdateSearchTermFromAPI(int nativeChromeBrowserProvider,
|
| + private native int nativeUpdateSearchTermFromAPI(long nativeChromeBrowserProvider,
|
| String search, Long date, String selection, String[] selectionArgs);
|
|
|
| - private native int nativeRemoveSearchTermFromAPI(int nativeChromeBrowserProvider,
|
| + private native int nativeRemoveSearchTermFromAPI(long nativeChromeBrowserProvider,
|
| String selection, String[] selectionArgs);
|
|
|
| // Client API native methods.
|
| - private native boolean nativeBookmarkNodeExists(int nativeChromeBrowserProvider, long id);
|
| + private native boolean nativeBookmarkNodeExists(long nativeChromeBrowserProvider, long id);
|
|
|
| - private native long nativeCreateBookmarksFolderOnce(int nativeChromeBrowserProvider,
|
| + private native long nativeCreateBookmarksFolderOnce(long nativeChromeBrowserProvider,
|
| String title, long parentId);
|
|
|
| - private native BookmarkNode nativeGetAllBookmarkFolders(int nativeChromeBrowserProvider);
|
| + private native BookmarkNode nativeGetAllBookmarkFolders(long nativeChromeBrowserProvider);
|
|
|
| - private native void nativeRemoveAllBookmarks(int nativeChromeBrowserProvider);
|
| + private native void nativeRemoveAllBookmarks(long nativeChromeBrowserProvider);
|
|
|
| - private native BookmarkNode nativeGetBookmarkNode(int nativeChromeBrowserProvider,
|
| + private native BookmarkNode nativeGetBookmarkNode(long nativeChromeBrowserProvider,
|
| long id, boolean getParent, boolean getChildren);
|
|
|
| - private native BookmarkNode nativeGetMobileBookmarksFolder(int nativeChromeBrowserProvider);
|
| + private native BookmarkNode nativeGetMobileBookmarksFolder(long nativeChromeBrowserProvider);
|
|
|
| - private native boolean nativeIsBookmarkInMobileBookmarksBranch(int nativeChromeBrowserProvider,
|
| + private native boolean nativeIsBookmarkInMobileBookmarksBranch(long nativeChromeBrowserProvider,
|
| long id);
|
|
|
| - private native byte[] nativeGetFaviconOrTouchIcon(int nativeChromeBrowserProvider, String url);
|
| + private native byte[] nativeGetFaviconOrTouchIcon(long nativeChromeBrowserProvider, String url);
|
|
|
| - private native byte[] nativeGetThumbnail(int nativeChromeBrowserProvider, String url);
|
| + private native byte[] nativeGetThumbnail(long nativeChromeBrowserProvider, String url);
|
| }
|
|
|