diff options
74 files changed, 368 insertions, 364 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java index 91e2b29..2531a8f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java @@ -29,7 +29,7 @@ public class BookmarksBridge { public static final int ROOT_FOLDER_ID = -1; private final Profile mProfile; - private int mNativeBookmarksBridge; + private long mNativeBookmarksBridge; private boolean mIsNativeBookmarkModelLoaded; private final List<DelayedBookmarkCallback> mDelayedBookmarkCallbacks = new ArrayList<DelayedBookmarkCallback>(); @@ -295,15 +295,15 @@ public class BookmarksBridge { return new BookmarkId(id, type); } - private native void nativeGetBookmarksForFolder(int nativeBookmarksBridge, + private native void nativeGetBookmarksForFolder(long nativeBookmarksBridge, BookmarkId folderId, BookmarksCallback callback, List<BookmarkItem> bookmarksList); - private native void nativeGetCurrentFolderHierarchy(int nativeBookmarksBridge, + private native void nativeGetCurrentFolderHierarchy(long nativeBookmarksBridge, BookmarkId folderId, BookmarksCallback callback, List<BookmarkItem> bookmarksList); - private native void nativeDeleteBookmark(int nativeBookmarksBridge, BookmarkId bookmarkId); - private native int nativeInit(Profile profile); - private native void nativeDestroy(int nativeBookmarksBridge); + private native void nativeDeleteBookmark(long nativeBookmarksBridge, BookmarkId bookmarkId); + private native long nativeInit(Profile profile); + private native void nativeDestroy(long nativeBookmarksBridge); private static native boolean nativeIsEditBookmarksEnabled(); /** 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 00747ae..d0179e9 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); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java index 7fade26..38b6cc5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java @@ -16,18 +16,18 @@ import org.chromium.base.CalledByNative; * constructor. */ public class ChromeHttpAuthHandler { - private final int mNativeChromeHttpAuthHandler; + private final long mNativeChromeHttpAuthHandler; private AutofillObserver mAutofillObserver; private String mAutofillUsername; private String mAutofillPassword; - private ChromeHttpAuthHandler(int nativeChromeHttpAuthHandler) { + private ChromeHttpAuthHandler(long nativeChromeHttpAuthHandler) { assert nativeChromeHttpAuthHandler != 0; mNativeChromeHttpAuthHandler = nativeChromeHttpAuthHandler; } @CalledByNative - private static ChromeHttpAuthHandler create(int nativeChromeHttpAuthHandler) { + private static ChromeHttpAuthHandler create(long nativeChromeHttpAuthHandler) { return new ChromeHttpAuthHandler(nativeChromeHttpAuthHandler); } @@ -122,13 +122,13 @@ public class ChromeHttpAuthHandler { // Native side calls // --------------------------------------------- - private native void nativeSetAuth(int nativeChromeHttpAuthHandler, + private native void nativeSetAuth(long nativeChromeHttpAuthHandler, String username, String password); - private native void nativeCancelAuth(int nativeChromeHttpAuthHandler); - private native String nativeGetCancelButtonText(int nativeChromeHttpAuthHandler); - private native String nativeGetMessageTitle(int nativeChromeHttpAuthHandler); - private native String nativeGetMessageBody(int nativeChromeHttpAuthHandler); - private native String nativeGetPasswordLabelText(int nativeChromeHttpAuthHandler); - private native String nativeGetOkButtonText(int nativeChromeHttpAuthHandler); - private native String nativeGetUsernameLabelText(int nativeChromeHttpAuthHandler); + private native void nativeCancelAuth(long nativeChromeHttpAuthHandler); + private native String nativeGetCancelButtonText(long nativeChromeHttpAuthHandler); + private native String nativeGetMessageTitle(long nativeChromeHttpAuthHandler); + private native String nativeGetMessageBody(long nativeChromeHttpAuthHandler); + private native String nativeGetPasswordLabelText(long nativeChromeHttpAuthHandler); + private native String nativeGetOkButtonText(long nativeChromeHttpAuthHandler); + private native String nativeGetUsernameLabelText(long nativeChromeHttpAuthHandler); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java index f1c0355..ad1a882 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java @@ -27,7 +27,7 @@ public class ChromeWebContentsDelegateAndroid extends WebContentsDelegateAndroid } @CalledByNative - public boolean addNewContents(int nativeSourceWebContents, int nativeWebContents, + public boolean addNewContents(long nativeSourceWebContents, long nativeWebContents, int disposition, Rect initialPosition, boolean userGesture) { return false; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ContentViewUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/ContentViewUtil.java index a241dca..7aa44af 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ContentViewUtil.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ContentViewUtil.java @@ -17,17 +17,17 @@ public abstract class ContentViewUtil { * @return pointer to native WebContents instance, suitable for using with a * (java) ContentViewCore instance. */ - public static int createNativeWebContents(boolean incognito) { + public static long createNativeWebContents(boolean incognito) { return nativeCreateNativeWebContents(incognito); } /** * @param webContentsPtr The WebContents reference to be deleted. */ - public static void destroyNativeWebContents(int webContentsPtr) { + public static void destroyNativeWebContents(long webContentsPtr) { nativeDestroyNativeWebContents(webContentsPtr); } - private static native int nativeCreateNativeWebContents(boolean incognito); - private static native void nativeDestroyNativeWebContents(int webContentsPtr); + private static native long nativeCreateNativeWebContents(boolean incognito); + private static native void nativeDestroyNativeWebContents(long webContentsPtr); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java index b910f80..7a1e872 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java @@ -17,7 +17,7 @@ import java.util.List; * devices. */ public class ForeignSessionHelper { - private int mNativeForeignSessionHelper; + private long mNativeForeignSessionHelper; /** * Callback interface for getting notified when foreign session sync is updated. @@ -214,20 +214,20 @@ public class ForeignSessionHelper { nativeDeleteForeignSession(mNativeForeignSessionHelper, session.tag); } - private static native int nativeInit(Profile profile); - private static native void nativeDestroy(int nativeForeignSessionHelper); - private static native boolean nativeIsTabSyncEnabled(int nativeForeignSessionHelper); + private static native long nativeInit(Profile profile); + private static native void nativeDestroy(long nativeForeignSessionHelper); + private static native boolean nativeIsTabSyncEnabled(long nativeForeignSessionHelper); private static native void nativeSetOnForeignSessionCallback( - int nativeForeignSessionHelper, ForeignSessionCallback callback); - private static native boolean nativeGetForeignSessions(int nativeForeignSessionHelper, + long nativeForeignSessionHelper, ForeignSessionCallback callback); + private static native boolean nativeGetForeignSessions(long nativeForeignSessionHelper, List<ForeignSession> resultSessions); // TODO(apiccion): Remvoe this method once downstream CL Lands. // See: http://crbug.com/257102 private static native boolean nativeOpenForeignSessionTabOld( - int nativeForeignSessionHelper, String sessionTag, int tabId); + long nativeForeignSessionHelper, String sessionTag, int tabId); private static native boolean nativeOpenForeignSessionTab( - int nativeForeignSessionHelper, TabBase tab, String sessionTag, int tabId, + long nativeForeignSessionHelper, TabBase tab, String sessionTag, int tabId, int disposition); private static native void nativeDeleteForeignSession( - int nativeForeignSessionHelper, String sessionTag); + long nativeForeignSessionHelper, String sessionTag); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java index 184221d..a25f7f2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java @@ -27,7 +27,7 @@ public class JavascriptAppModalDialog implements DialogInterface.OnClickListener private final String mTitle; private final String mMessage; private final boolean mShouldShowSuppressCheckBox; - private int mNativeDialogPointer; + private long mNativeDialogPointer; private AlertDialog mDialog; private CheckBox mSuppressCheckBox; private TextView mPrompTextView; @@ -66,7 +66,7 @@ public class JavascriptAppModalDialog implements DialogInterface.OnClickListener } @CalledByNative - void showJavascriptAppModalDialog(WindowAndroid window, int nativeDialogPointer) { + void showJavascriptAppModalDialog(WindowAndroid window, long nativeDialogPointer) { assert window != null; Context context = window.getContext(); @@ -272,10 +272,10 @@ public class JavascriptAppModalDialog implements DialogInterface.OnClickListener } } - private native void nativeDidAcceptAppModalDialog(int nativeJavascriptAppModalDialogAndroid, + private native void nativeDidAcceptAppModalDialog(long nativeJavascriptAppModalDialogAndroid, String prompt, boolean suppress); - private native void nativeDidCancelAppModalDialog(int nativeJavascriptAppModalDialogAndroid, + private native void nativeDidCancelAppModalDialog(long nativeJavascriptAppModalDialogAndroid, boolean suppress); private static native JavascriptAppModalDialog nativeGetCurrentModalDialog(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java index 82ee4664..78e8ac5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java @@ -48,7 +48,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt private final int mFaviconSize; - private int mNativeNavigationPopup; + private long mNativeNavigationPopup; /** * Constructs a new popup with the given history information. @@ -233,7 +233,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt private static native String nativeGetHistoryUrl(); - private native int nativeInit(); - private native void nativeDestroy(int nativeNavigationPopup); - private native void nativeFetchFaviconForUrl(int nativeNavigationPopup, String url); + private native long nativeInit(); + private native void nativeDestroy(long nativeNavigationPopup); + private native void nativeFetchFaviconForUrl(long nativeNavigationPopup, String url); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java index 93ab126..8457d34 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java @@ -11,7 +11,7 @@ import org.chromium.chrome.browser.profiles.Profile; * This class allows Java code to read and modify preferences related to the NTP */ public class NewTabPagePrefs { - private final int mNativeNewTabPagePrefs; + private final long mNativeNewTabPagePrefs; /** * Initialize this class with the given profile. @@ -96,21 +96,21 @@ public class NewTabPagePrefs { return nativeGetForeignSessionCollapsed(mNativeNewTabPagePrefs, session.tag); } - private static native int nativeInit(Profile profile); - private static native void nativeDestroy(int nativeNewTabPagePrefs); + private static native long nativeInit(Profile profile); + private static native void nativeDestroy(long nativeNewTabPagePrefs); private static native void nativeSetSnapshotDocumentCollapsed( - int nativeNewTabPagePrefs, boolean isCollapsed); + long nativeNewTabPagePrefs, boolean isCollapsed); private static native boolean nativeGetSnapshotDocumentCollapsed( - int nativeNewTabPagePrefs); + long nativeNewTabPagePrefs); private static native void nativeSetRecentlyClosedTabsCollapsed( - int nativeNewTabPagePrefs, boolean isCollapsed); + long nativeNewTabPagePrefs, boolean isCollapsed); private static native boolean nativeGetRecentlyClosedTabsCollapsed( - int nativeNewTabPagePrefs); - private static native void nativeSetSyncPromoCollapsed(int nativeNewTabPagePrefs, + long nativeNewTabPagePrefs); + private static native void nativeSetSyncPromoCollapsed(long nativeNewTabPagePrefs, boolean isCollapsed); - private static native boolean nativeGetSyncPromoCollapsed(int nativeNewTabPagePrefs); + private static native boolean nativeGetSyncPromoCollapsed(long nativeNewTabPagePrefs); private static native void nativeSetForeignSessionCollapsed( - int nativeNewTabPagePrefs, String sessionTag, boolean isCollapsed); + long nativeNewTabPagePrefs, String sessionTag, boolean isCollapsed); private static native boolean nativeGetForeignSessionCollapsed( - int nativeNewTabPagePrefs, String sessionTag); + long nativeNewTabPagePrefs, String sessionTag); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java b/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java index 199eb77..7fbc078 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java @@ -61,7 +61,7 @@ public final class PasswordUIView { new ObserverList<PasswordListObserver>(); // Pointer to native implementation, set to 0 in destroy(). - private int mNativePasswordUIViewAndroid; + private long mNativePasswordUIViewAndroid; /** * Constructor creates the native object as well. Callers should call destroy() after usage. @@ -149,25 +149,25 @@ public final class PasswordUIView { mObservers.clear(); } - private native int nativeInit(); + private native long nativeInit(); - private native void nativeUpdatePasswordLists(int nativePasswordUIViewAndroid); + private native void nativeUpdatePasswordLists(long nativePasswordUIViewAndroid); private native SavedPasswordEntry nativeGetSavedPasswordEntry( - int nativePasswordUIViewAndroid, + long nativePasswordUIViewAndroid, int index); - private native String nativeGetSavedPasswordException(int nativePasswordUIViewAndroid, + private native String nativeGetSavedPasswordException(long nativePasswordUIViewAndroid, int index); private native void nativeHandleRemoveSavedPasswordEntry( - int nativePasswordUIViewAndroid, + long nativePasswordUIViewAndroid, int index); private native void nativeHandleRemoveSavedPasswordException( - int nativePasswordUIViewAndroid, + long nativePasswordUIViewAndroid, int index); - private native void nativeDestroy(int nativePasswordUIViewAndroid); + private native void nativeDestroy(long nativePasswordUIViewAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java index 2271d5e..83fd616 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java @@ -14,7 +14,7 @@ import java.util.List; * This class allows Java code to get and clear the list of recently closed tabs. */ public class RecentlyClosedBridge { - private int mNativeRecentlyClosedTabsBridge; + private long mNativeRecentlyClosedTabsBridge; /** * Callback interface for getting notified when the list of recently closed tabs is updated. @@ -110,13 +110,13 @@ public class RecentlyClosedBridge { nativeClearRecentlyClosedTabs(mNativeRecentlyClosedTabsBridge); } - private native int nativeInit(Profile profile); - private native void nativeDestroy(int nativeRecentlyClosedTabsBridge); + private native long nativeInit(Profile profile); + private native void nativeDestroy(long nativeRecentlyClosedTabsBridge); private native void nativeSetRecentlyClosedCallback( - int nativeRecentlyClosedTabsBridge, RecentlyClosedCallback callback); + long nativeRecentlyClosedTabsBridge, RecentlyClosedCallback callback); private native boolean nativeGetRecentlyClosedTabs( - int nativeRecentlyClosedTabsBridge, List<RecentlyClosedTab> tabs); + long nativeRecentlyClosedTabsBridge, List<RecentlyClosedTab> tabs); private native boolean nativeOpenRecentlyClosedTab( - int nativeRecentlyClosedTabsBridge, TabBase tab, int recentTabId); - private native void nativeClearRecentlyClosedTabs(int nativeRecentlyClosedTabsBridge); + long nativeRecentlyClosedTabsBridge, TabBase tab, int recentTabId); + private native void nativeClearRecentlyClosedTabs(long nativeRecentlyClosedTabsBridge); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java index ed078b6..850f037 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java @@ -93,6 +93,6 @@ public class ShortcutHelper { context.startActivity(homeIntent); } - private static native void nativeAddShortcut(int tabAndroidPtr, String userRequestedTitle, + private static native void nativeAddShortcut(long tabAndroidPtr, String userRequestedTitle, int launcherLargeIconSize); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java index 741f1ee..68ae426 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java @@ -43,7 +43,7 @@ public abstract class TabBase implements NavigationClient { /** Used for automatically generating tab ids. */ private static final AtomicInteger sIdCounter = new AtomicInteger(); - private int mNativeTabAndroid; + private long mNativeTabAndroid; /** Unique id of this tab (within its container). */ private final int mId; @@ -551,7 +551,7 @@ public abstract class TabBase implements NavigationClient { * * @param nativeWebContents The native web contents pointer. */ - protected void initContentView(int nativeWebContents) { + protected void initContentView(long nativeWebContents) { NativePage previousNativePage = mNativePage; mNativePage = null; destroyNativePageInternal(previousNativePage); @@ -697,13 +697,13 @@ public abstract class TabBase implements NavigationClient { * @return The native pointer representing the native side of this {@link TabBase} object. */ @CalledByNative - protected int getNativePtr() { + protected long getNativePtr() { return mNativeTabAndroid; } /** This is currently called when committing a pre-rendered page. */ @CalledByNative - private void swapWebContents(final int newWebContents) { + private void swapWebContents(final long newWebContents) { destroyContentView(false); NativePage previousNativePage = mNativePage; mNativePage = null; @@ -721,13 +721,13 @@ public abstract class TabBase implements NavigationClient { } @CalledByNative - private void setNativePtr(int nativePtr) { + private void setNativePtr(long nativePtr) { assert mNativeTabAndroid == 0; mNativeTabAndroid = nativePtr; } @CalledByNative - private int getNativeInfoBarContainer() { + private long getNativeInfoBarContainer() { return getInfoBarContainer().getNative(); } @@ -773,12 +773,12 @@ public abstract class TabBase implements NavigationClient { sIdCounter.addAndGet(diff); } - private native void nativeInitWebContents(int nativeTabAndroid, boolean incognito, + private native void nativeInitWebContents(long nativeTabAndroid, boolean incognito, ContentViewCore contentViewCore, ChromeWebContentsDelegateAndroid delegate); - private native void nativeDestroyWebContents(int nativeTabAndroid, boolean deleteNative); - private native Profile nativeGetProfileAndroid(int nativeTabAndroid); - private native int nativeGetSecurityLevel(int nativeTabAndroid); - private native void nativeSetActiveNavigationEntryTitleForUrl(int nativeTabAndroid, String url, + private native void nativeDestroyWebContents(long nativeTabAndroid, boolean deleteNative); + private native Profile nativeGetProfileAndroid(long nativeTabAndroid); + private native int nativeGetSecurityLevel(long nativeTabAndroid); + private native void nativeSetActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title); private native boolean nativePrint(int nativeTabAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java index a7c9e7d..98004a5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java @@ -34,13 +34,13 @@ class TtsPlatformImpl { private final String mLanguage; } - private int mNativeTtsPlatformImplAndroid; + private long mNativeTtsPlatformImplAndroid; private final TextToSpeech mTextToSpeech; private boolean mInitialized; private ArrayList<TtsVoice> mVoices; private String mCurrentLanguage; - private TtsPlatformImpl(int nativeTtsPlatformImplAndroid, Context context) { + private TtsPlatformImpl(long nativeTtsPlatformImplAndroid, Context context) { mInitialized = false; mNativeTtsPlatformImplAndroid = nativeTtsPlatformImplAndroid; mTextToSpeech = new TextToSpeech(context, new TextToSpeech.OnInitListener() { @@ -232,8 +232,8 @@ class TtsPlatformImpl { nativeVoicesChanged(mNativeTtsPlatformImplAndroid); } - private native void nativeVoicesChanged(int nativeTtsPlatformImplAndroid); - private native void nativeOnEndEvent(int nativeTtsPlatformImplAndroid, int utteranceId); - private native void nativeOnStartEvent(int nativeTtsPlatformImplAndroid, int utteranceId); - private native void nativeOnErrorEvent(int nativeTtsPlatformImplAndroid, int utteranceId); + private native void nativeVoicesChanged(long nativeTtsPlatformImplAndroid); + private native void nativeOnEndEvent(long nativeTtsPlatformImplAndroid, int utteranceId); + private native void nativeOnStartEvent(long nativeTtsPlatformImplAndroid, int utteranceId); + private native void nativeOnErrorEvent(long nativeTtsPlatformImplAndroid, int utteranceId); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java index 6fe31bb..c25a09f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java @@ -43,7 +43,7 @@ class WebsiteSettingsPopup implements OnClickListener { private String mLinkUrl; private WebsiteSettingsPopup(Context context, ContentViewCore contentViewCore, - final int nativeWebsiteSettingsPopup) { + final long nativeWebsiteSettingsPopup) { mContext = context; mDialog = new Dialog(mContext); mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE); @@ -145,10 +145,10 @@ class WebsiteSettingsPopup implements OnClickListener { @CalledByNative private static WebsiteSettingsPopup create(Context context, ContentViewCore contentViewCore, - int nativeWebsiteSettingsPopup) { + long nativeWebsiteSettingsPopup) { return new WebsiteSettingsPopup(context, contentViewCore, nativeWebsiteSettingsPopup); } - private native void nativeDestroy(int nativeWebsiteSettingsPopupAndroid); + private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid); private native byte[][] nativeGetCertificateChain(ContentViewCore contentViewCore); -}
\ No newline at end of file +} diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java index ab30ea0..0026081 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java @@ -19,7 +19,7 @@ public class AutofillDialogControllerAndroid { private static AutofillDialogFactory sDialogFactory; private static boolean sAllowInsecureDialogsForTesting = false; - private int mNativeDelegate; // could be 0 after onDestroy(). + private long mNativeDelegate; // could be 0 after onDestroy(). private AutofillDialog mDialog; /** @@ -108,7 +108,7 @@ public class AutofillDialogControllerAndroid { } private AutofillDialogControllerAndroid( - final int nativeAutofillDialogControllerAndroid, + final long nativeAutofillDialogControllerAndroid, final WindowAndroid windowAndroid, final boolean requestFullBillingAddress, final boolean requestShippingAddress, final boolean requestPhoneNumbers, @@ -159,7 +159,7 @@ public class AutofillDialogControllerAndroid { @CalledByNative private static AutofillDialogControllerAndroid create( - final int nativeAutofillDialogControllerAndroid, + final long nativeAutofillDialogControllerAndroid, final WindowAndroid windowAndroid, final boolean requestFullBillingAddress, final boolean requestShippingAddress, final boolean requestPhoneNumbers, @@ -198,8 +198,8 @@ public class AutofillDialogControllerAndroid { // Calls from Java to C++ AutofillDialogControllerAndroid: - private native void nativeDialogCancel(int nativeAutofillDialogControllerAndroid); - private native void nativeDialogContinue(int nativeAutofillDialogControllerAndroid, + private native void nativeDialogCancel(long nativeAutofillDialogControllerAndroid); + private native void nativeDialogContinue(long nativeAutofillDialogControllerAndroid, Object fullWallet, boolean lastUsedChoiceIsAutofill, String lastUsedAccountName, String guidLastUsedBilling, String guidLastUsedShipping, String guidLastUsedCard); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java index bbac1de..1586210 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java @@ -18,17 +18,17 @@ import org.chromium.ui.base.WindowAndroid; */ @JNINamespace("autofill") public class AutofillPopupGlue implements AutofillPopupDelegate{ - private final int mNativeAutofillPopup; + private final long mNativeAutofillPopup; private final AutofillPopup mAutofillPopup; - public AutofillPopupGlue(int nativeAutofillPopupViewAndroid, WindowAndroid windowAndroid, + public AutofillPopupGlue(long nativeAutofillPopupViewAndroid, WindowAndroid windowAndroid, ViewAndroidDelegate containerViewDelegate) { mNativeAutofillPopup = nativeAutofillPopupViewAndroid; mAutofillPopup = new AutofillPopup(windowAndroid.getContext(), containerViewDelegate, this); } @CalledByNative - private static AutofillPopupGlue create(int nativeAutofillPopupViewAndroid, + private static AutofillPopupGlue create(long nativeAutofillPopupViewAndroid, WindowAndroid windowAndroid, ViewAndroid viewAndroid) { return new AutofillPopupGlue(nativeAutofillPopupViewAndroid, windowAndroid, viewAndroid.getViewAndroidDelegate()); @@ -93,7 +93,7 @@ public class AutofillPopupGlue implements AutofillPopupDelegate{ array[index] = new AutofillSuggestion(label, sublabel, uniqueId); } - private native void nativeRequestHide(int nativeAutofillPopupViewAndroid); - private native void nativeSuggestionSelected(int nativeAutofillPopupViewAndroid, + private native void nativeRequestHide(long nativeAutofillPopupViewAndroid); + private native void nativeSuggestionSelected(long nativeAutofillPopupViewAndroid, int listIndex); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java index 3abe5e4..a54dd62 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java @@ -280,7 +280,7 @@ public class PersonalDataManager { return sManager; } - private final int mPersonalDataManagerAndroid; + private final long mPersonalDataManagerAndroid; private final List<PersonalDataManagerObserver> mDataObservers = new ArrayList<PersonalDataManagerObserver>(); @@ -392,22 +392,22 @@ public class PersonalDataManager { return nativeIsAutofillManaged(); } - private native int nativeInit(); - private native int nativeGetProfileCount(int nativePersonalDataManagerAndroid); - private native AutofillProfile nativeGetProfileByIndex(int nativePersonalDataManagerAndroid, + private native long nativeInit(); + private native int nativeGetProfileCount(long nativePersonalDataManagerAndroid); + private native AutofillProfile nativeGetProfileByIndex(long nativePersonalDataManagerAndroid, int index); - private native AutofillProfile nativeGetProfileByGUID(int nativePersonalDataManagerAndroid, + private native AutofillProfile nativeGetProfileByGUID(long nativePersonalDataManagerAndroid, String guid); - private native String nativeSetProfile(int nativePersonalDataManagerAndroid, + private native String nativeSetProfile(long nativePersonalDataManagerAndroid, AutofillProfile profile); - private native int nativeGetCreditCardCount(int nativePersonalDataManagerAndroid); - private native CreditCard nativeGetCreditCardByIndex(int nativePersonalDataManagerAndroid, + private native int nativeGetCreditCardCount(long nativePersonalDataManagerAndroid); + private native CreditCard nativeGetCreditCardByIndex(long nativePersonalDataManagerAndroid, int index); - private native CreditCard nativeGetCreditCardByGUID(int nativePersonalDataManagerAndroid, + private native CreditCard nativeGetCreditCardByGUID(long nativePersonalDataManagerAndroid, String guid); - private native String nativeSetCreditCard(int nativePersonalDataManagerAndroid, + private native String nativeSetCreditCard(long nativePersonalDataManagerAndroid, CreditCard card); - private native void nativeRemoveByGUID(int nativePersonalDataManagerAndroid, String guid); + private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid); private static native boolean nativeIsAutofillEnabled(); private static native void nativeSetAutofillEnabled(boolean enable); private static native boolean nativeIsAutofillManaged(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java b/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java index 4ed3be0..df254c5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java @@ -19,7 +19,7 @@ import java.sql.Types; public class SQLiteCursor extends AbstractCursor { private static final String TAG = "SQLiteCursor"; // Used by JNI. - private int mNativeSQLiteCursor; + private long mNativeSQLiteCursor; // The count of result rows. private int mCount = -1; @@ -34,12 +34,12 @@ public class SQLiteCursor extends AbstractCursor { private final Object mMoveLock = new Object(); private final Object mGetBlobLock = new Object(); - private SQLiteCursor(int nativeSQLiteCursor) { + private SQLiteCursor(long nativeSQLiteCursor) { mNativeSQLiteCursor = nativeSQLiteCursor; } @CalledByNative - private static SQLiteCursor create(int nativeSQLiteCursor) { + private static SQLiteCursor create(long nativeSQLiteCursor) { return new SQLiteCursor(nativeSQLiteCursor); } @@ -232,15 +232,15 @@ public class SQLiteCursor extends AbstractCursor { return mColumnTypes[index]; } - private native void nativeDestroy(int nativeSQLiteCursor); - private native int nativeGetCount(int nativeSQLiteCursor); - private native String[] nativeGetColumnNames(int nativeSQLiteCursor); - private native int nativeGetColumnType(int nativeSQLiteCursor, int column); - private native String nativeGetString(int nativeSQLiteCursor, int column); - private native byte[] nativeGetBlob(int nativeSQLiteCursor, int column); - private native boolean nativeIsNull(int nativeSQLiteCursor, int column); - private native long nativeGetLong(int nativeSQLiteCursor, int column); - private native int nativeGetInt(int nativeSQLiteCursor, int column); - private native double nativeGetDouble(int nativeSQLiteCursor, int column); - private native int nativeMoveTo(int nativeSQLiteCursor, int newPosition); + private native void nativeDestroy(long nativeSQLiteCursor); + private native int nativeGetCount(long nativeSQLiteCursor); + private native String[] nativeGetColumnNames(long nativeSQLiteCursor); + private native int nativeGetColumnType(long nativeSQLiteCursor, int column); + private native String nativeGetString(long nativeSQLiteCursor, int column); + private native byte[] nativeGetBlob(long nativeSQLiteCursor, int column); + private native boolean nativeIsNull(long nativeSQLiteCursor, int column); + private native long nativeGetLong(long nativeSQLiteCursor, int column); + private native int nativeGetInt(long nativeSQLiteCursor, int column); + private native double nativeGetDouble(long nativeSQLiteCursor, int column); + private native int nativeMoveTo(long nativeSQLiteCursor, int newPosition); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java index d387c1f..b929a18 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java @@ -25,7 +25,7 @@ public class FaviconHelper { public static final int TOUCH_ICON = 1 << 1; public static final int TOUCH_PRECOMPOSED_ICON = 1 << 2; - private int mNativeFaviconHelper; + private long mNativeFaviconHelper; /** * Callback interface for getting the result from getLocalFaviconImageForURL method. @@ -104,13 +104,13 @@ public class FaviconHelper { return nativeGetSyncedFaviconImageForURL(mNativeFaviconHelper, profile, pageUrl); } - private static native int nativeInit(); - private static native void nativeDestroy(int nativeFaviconHelper); - private static native boolean nativeGetLocalFaviconImageForURL(int nativeFaviconHelper, + private static native long nativeInit(); + private static native void nativeDestroy(long nativeFaviconHelper); + private static native boolean nativeGetLocalFaviconImageForURL(long nativeFaviconHelper, Profile profile, String pageUrl, int iconTypes, int desiredSizeInDip, FaviconImageCallback faviconImageCallback); - private static native Bitmap nativeGetSyncedFaviconImageForURL(int nativeFaviconHelper, + private static native Bitmap nativeGetSyncedFaviconImageForURL(long nativeFaviconHelper, Profile profile, String pageUrl); - private static native int nativeGetDominantColorForBitmap(int nativeFaviconHelper, + private static native int nativeGetDominantColorForBitmap(long nativeFaviconHelper, Bitmap image); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java index 70f1465..6bcd00a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java @@ -20,7 +20,7 @@ public class AutoLoginDelegate { private final AutoLoginProcessor mAutoLoginProcessor; // nativeInfoBar -> AutoLoginAccountDelegate - private Pair<Integer, AutoLoginAccountDelegate> mAccountHelper; + private Pair<Long, AutoLoginAccountDelegate> mAccountHelper; public AutoLoginDelegate(AutoLoginProcessor autoLoginProcessor, Activity activity) { mActivity = activity; @@ -32,7 +32,7 @@ public class AutoLoginDelegate { * @return the account name of the device if any. */ @CalledByNative - String initializeAccount(int nativeInfoBar, String realm, String account, String args) { + String initializeAccount(long nativeInfoBar, String realm, String account, String args) { AutoLoginAccountDelegate accountHelper = new AutoLoginAccountDelegate(mActivity, mAutoLoginProcessor, realm, account, args); @@ -40,7 +40,7 @@ public class AutoLoginDelegate { return ""; } - mAccountHelper = new Pair<Integer, AutoLoginAccountDelegate>(nativeInfoBar, accountHelper); + mAccountHelper = new Pair<Long, AutoLoginAccountDelegate>(nativeInfoBar, accountHelper); return accountHelper.getAccountName(); } @@ -48,7 +48,7 @@ public class AutoLoginDelegate { * Log in a user to a given google service. */ @CalledByNative - boolean logIn(int nativeInfoBar) { + boolean logIn(long nativeInfoBar) { AutoLoginAccountDelegate account = mAccountHelper != null && mAccountHelper.first == nativeInfoBar ? mAccountHelper.second : null; @@ -64,7 +64,7 @@ public class AutoLoginDelegate { * Clear account information for cancelled login requests. */ @CalledByNative - boolean cancelLogIn(int nativeInfoBar) { + boolean cancelLogIn(long nativeInfoBar) { mAccountHelper = null; return true; } @@ -76,7 +76,7 @@ public class AutoLoginDelegate { String result) { if (mAccountHelper != null) { - int infoBar = mAccountHelper.first; + long infoBar = mAccountHelper.first; AutoLoginAccountDelegate delegate = mAccountHelper.second; if (!delegate.loginRequested()) { nativeLoginDismiss(infoBar); @@ -95,8 +95,8 @@ public class AutoLoginDelegate { } } - private native void nativeLoginSuccess(int nativeAutoLoginInfoBarDelegateAndroid, + private native void nativeLoginSuccess(long nativeAutoLoginInfoBarDelegateAndroid, String result); - private native void nativeLoginFailed(int nativeAutoLoginInfoBarDelegateAndroid); - private native void nativeLoginDismiss(int nativeAutoLoginInfoBarDelegateAndroid); + private native void nativeLoginFailed(long nativeAutoLoginInfoBarDelegateAndroid); + private native void nativeLoginDismiss(long nativeAutoLoginInfoBarDelegateAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java index 916c511..b210709 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java @@ -44,7 +44,7 @@ public class ConfirmInfoBar extends TwoButtonInfoBar { primaryButtonText, secondaryButtonText); } - public ConfirmInfoBar(int nativeInfoBar, InfoBarListeners.Confirm confirmListener, + public ConfirmInfoBar(long nativeInfoBar, InfoBarListeners.Confirm confirmListener, int backgroundType, int iconDrawableId, String message, String linkText, String primaryButtonText, String secondaryButtonText) { super(confirmListener, backgroundType, iconDrawableId); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java index 4818b9e..b43830e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java @@ -32,7 +32,7 @@ public class ConfirmInfoBarDelegate { * @param buttonCancel String to display on the Cancel button. */ @CalledByNative - InfoBar showConfirmInfoBar(int nativeInfoBar, int enumeratedIconId, String message, + InfoBar showConfirmInfoBar(long nativeInfoBar, int enumeratedIconId, String message, String linkText, String buttonOk, String buttonCancel) { int drawableId = ResourceId.mapToDrawableId(enumeratedIconId); @@ -43,4 +43,4 @@ public class ConfirmInfoBarDelegate { buttonCancel); return infoBar; } -}
\ No newline at end of file +} diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java index 2bb06c9d..102f6ef 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java @@ -56,7 +56,7 @@ public abstract class InfoBar implements InfoBarView { // This cannot be private until the swap in place infrastructure is // improved since subclasses need to access a possibly replaced native // pointer. - protected int mNativeInfoBarPtr; + protected long mNativeInfoBarPtr; // Used by tests to reference infobars. private final int mId; @@ -82,7 +82,7 @@ public abstract class InfoBar implements InfoBarView { * Stores a pointer to the native-side counterpart of this InfoBar. * @param nativeInfoBarPtr Pointer to the NativeInfoBar. */ - protected void setNativeInfoBar(int nativeInfoBarPtr) { + protected void setNativeInfoBar(long nativeInfoBarPtr) { if (nativeInfoBarPtr != 0) { // The native code takes care of expiring infobars on navigations. mExpireOnNavigation = false; @@ -95,7 +95,7 @@ public abstract class InfoBar implements InfoBarView { * responsible for managing the cleanup of the pointer. * @param nativeInfoBarPtr Pointer to the NativeInfoBar. */ - protected void replaceNativePointer(int newInfoBarPtr) { + protected void replaceNativePointer(long newInfoBarPtr) { mNativeInfoBarPtr = newInfoBarPtr; } @@ -116,7 +116,7 @@ public abstract class InfoBar implements InfoBarView { /** * @return true if this java infobar owns this {@code nativePointer} */ - boolean ownsNativeInfoBar(int nativePointer) { + boolean ownsNativeInfoBar(long nativePointer) { return mNativeInfoBarPtr == nativePointer; } @@ -256,8 +256,8 @@ public abstract class InfoBar implements InfoBarView { mListener = listener; } - protected native void nativeOnLinkClicked(int nativeInfoBarAndroid); + protected native void nativeOnLinkClicked(long nativeInfoBarAndroid); protected native void nativeOnButtonClicked( - int nativeInfoBarAndroid, int action, String actionValue); - protected native void nativeOnCloseButtonClicked(int nativeInfoBarAndroid); + long nativeInfoBarAndroid, int action, String actionValue); + protected native void nativeOnCloseButtonClicked(long nativeInfoBarAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java index 8855b65..788e1a8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java @@ -67,7 +67,7 @@ public class InfoBarContainer extends LinearLayout { private InfoBarAnimationListener mAnimationListener; // Native InfoBarContainer pointer which will be set by nativeInit() - private int mNativeInfoBarContainer; + private long mNativeInfoBarContainer; private final Activity mActivity; @@ -96,7 +96,7 @@ public class InfoBarContainer extends LinearLayout { private ViewGroup mParentView; public InfoBarContainer(Activity activity, AutoLoginProcessor autoLoginProcessor, - int tabId, ViewGroup parentView, int nativeWebContents) { + int tabId, ViewGroup parentView, long nativeWebContents) { super(activity); setOrientation(LinearLayout.VERTICAL); mAnimationListener = null; @@ -512,11 +512,11 @@ public class InfoBarContainer extends LinearLayout { return null; } - public int getNative() { + public long getNative() { return mNativeInfoBarContainer; } - private native int nativeInit(int webContentsPtr, AutoLoginDelegate autoLoginDelegate); + private native long nativeInit(long webContentsPtr, AutoLoginDelegate autoLoginDelegate); - private native void nativeDestroy(int nativeInfoBarContainerAndroid); + private native void nativeDestroy(long nativeInfoBarContainerAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java index adc37da..0232105 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java @@ -41,7 +41,7 @@ public class TranslateInfoBar extends TwoButtonInfoBar implements SubPanelListen private final boolean mShouldShowNeverBar; private final TranslateInfoBarDelegate mTranslateDelegate; - public TranslateInfoBar(int nativeInfoBarPtr, TranslateInfoBarDelegate delegate, + public TranslateInfoBar(long nativeInfoBarPtr, TranslateInfoBarDelegate delegate, int infoBarType, int sourceLanguageIndex, int targetLanguageIndex, boolean autoTranslatePair, boolean shouldShowNeverBar, String[] languages) { super(null, BACKGROUND_TYPE_INFO, @@ -330,7 +330,7 @@ public class TranslateInfoBar extends TwoButtonInfoBar implements SubPanelListen return mInfoBarType; } - void changeInfoBarTypeAndNativePointer(int infoBarType, int newNativePointer) { + void changeInfoBarTypeAndNativePointer(int infoBarType, long newNativePointer) { if (infoBarType >= 0 && infoBarType < MAX_INFOBAR_INDEX) { mInfoBarType = infoBarType; replaceNativePointer(newNativePointer); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java index d7267ad..f0a5d9a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java @@ -21,14 +21,14 @@ public class TranslateInfoBarDelegate { @CalledByNative boolean changeTranslateInfoBarTypeAndPointer( - int newNativeInfoBar, int translateBarType) { + long newNativeInfoBar, int translateBarType) { mInfoBar.changeInfoBarTypeAndNativePointer(translateBarType, newNativeInfoBar); return true; } @CalledByNative InfoBar showTranslateInfoBar( - int nativeInfoBar, int translateBarType, + long nativeInfoBar, int translateBarType, int sourceLanguageIndex, int targetLanguageIndex, boolean autoTranslatePair, boolean showNeverInfobar, String[] languages) { mInfoBar = new TranslateInfoBar(nativeInfoBar, this, translateBarType, @@ -37,14 +37,14 @@ public class TranslateInfoBarDelegate { return mInfoBar; } - public void applyTranslateOptions(int nativeTranslateInfoBar, + public void applyTranslateOptions(long nativeTranslateInfoBar, int sourceLanguageIndex, int targetLanguageIndex, boolean alwaysTranslate, boolean neverTranslateLanguage, boolean neverTranslateSite) { nativeApplyTranslateOptions(nativeTranslateInfoBar, sourceLanguageIndex, targetLanguageIndex, alwaysTranslate, neverTranslateLanguage, neverTranslateSite); } - private native void nativeApplyTranslateOptions(int nativeTranslateInfoBar, + private native void nativeApplyTranslateOptions(long nativeTranslateInfoBar, int sourceLanguageIndex, int targetLanguageIndex, boolean alwaysTranslate, boolean neverTranslateLanguage, boolean neverTranslateSite); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java index d01b171..d0c1704 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java @@ -42,7 +42,7 @@ public class DataReductionProxySettings { return sSettings; } - private final int mNativeDataReductionProxySettings; + private final long mNativeDataReductionProxySettings; private DataReductionProxySettings() { // Note that this technically leaks the native object, however, @@ -187,35 +187,35 @@ public class DataReductionProxySettings { return percent; } - private native int nativeInit(); + private native long nativeInit(); private native void nativeInitDataReductionProxySettings( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native void nativeBypassHostPattern( - int nativeDataReductionProxySettingsAndroid, String pattern); + long nativeDataReductionProxySettingsAndroid, String pattern); private native void nativeBypassURLPattern( - int nativeDataReductionProxySettingsAndroid, String pattern); + long nativeDataReductionProxySettingsAndroid, String pattern); private native boolean nativeIsDataReductionProxyAllowed( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native boolean nativeIsDataReductionProxyPromoAllowed( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native String nativeGetDataReductionProxyOrigin( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native boolean nativeIsDataReductionProxyEnabled( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native boolean nativeIsDataReductionProxyManaged( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native void nativeSetDataReductionProxyEnabled( - int nativeDataReductionProxySettingsAndroid, boolean enabled); + long nativeDataReductionProxySettingsAndroid, boolean enabled); private native long nativeGetDataReductionLastUpdateTime( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native ContentLengths nativeGetContentLengths( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native boolean nativeIsAcceptableAuthChallenge( - int nativeDataReductionProxySettingsAndroid, String host, String realm); + long nativeDataReductionProxySettingsAndroid, String host, String realm); private native String nativeGetTokenForAuthChallenge( - int nativeDataReductionProxySettingsAndroid, String host, String realm); + long nativeDataReductionProxySettingsAndroid, String host, String realm); private native long[] nativeGetDailyOriginalContentLengths( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); private native long[] nativeGetDailyReceivedContentLengths( - int nativeDataReductionProxySettingsAndroid); + long nativeDataReductionProxySettingsAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java index a99e765..be81c37 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java @@ -16,7 +16,7 @@ import org.chromium.chrome.browser.profiles.Profile; * */ public class OmniboxPrerender { - private int mNativeOmniboxPrerender = 0; + private long mNativeOmniboxPrerender = 0; /** * Constructor for creating a OmniboxPrerender instanace. @@ -63,12 +63,12 @@ public class OmniboxPrerender { profile, nativeWebContents); } - private native int nativeInit(); - private native void nativeClear(int nativeOmniboxPrerender, Profile profile); + private native long nativeInit(); + private native void nativeClear(long nativeOmniboxPrerender, Profile profile); private native void nativeInitializeForProfile( - int nativeOmniboxPrerender, + long nativeOmniboxPrerender, Profile profile); - private native void nativePrerenderMaybe(int nativeOmniboxPrerender, String url, + private native void nativePrerenderMaybe(long nativeOmniboxPrerender, String url, String currentUrl, int nativeAutocompleteResult, Profile profile, int nativeWebContents); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java index 32fb8a2..3783554 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java @@ -14,14 +14,14 @@ import org.chromium.chrome.browser.profiles.Profile; @JNINamespace("prerender") public class ExternalPrerenderHandler { - private int mNativeExternalPrerenderHandler; + private long mNativeExternalPrerenderHandler; public ExternalPrerenderHandler() { mNativeExternalPrerenderHandler = nativeInit(); } - public int addPrerender(Profile profile, String url, String referrer, int width, int height) { - int webContentsPtr = ContentViewUtil.createNativeWebContents(false); + public long addPrerender(Profile profile, String url, String referrer, int width, int height) { + long webContentsPtr = ContentViewUtil.createNativeWebContents(false); if (nativeAddPrerender(mNativeExternalPrerenderHandler, profile, webContentsPtr, url, referrer, width, height)) { return webContentsPtr; @@ -34,16 +34,16 @@ public class ExternalPrerenderHandler { nativeCancelCurrentPrerender(mNativeExternalPrerenderHandler); } - public static boolean hasPrerenderedUrl(Profile profile, String url, int webContentsPtr) { + public static boolean hasPrerenderedUrl(Profile profile, String url, long webContentsPtr) { return nativeHasPrerenderedUrl(profile, url, webContentsPtr); } - private static native int nativeInit(); + private static native long nativeInit(); private static native boolean nativeAddPrerender( - int nativeExternalPrerenderHandlerAndroid, Profile profile, - int webContentsPtr, String url, String referrer, int width, int height); + long nativeExternalPrerenderHandlerAndroid, Profile profile, + long webContentsPtr, String url, String referrer, int width, int height); private static native boolean nativeHasPrerenderedUrl( - Profile profile, String url, int webContentsPtr); + Profile profile, String url, long webContentsPtr); private static native void nativeCancelCurrentPrerender( - int nativeExternalPrerenderHandlerAndroid); + long nativeExternalPrerenderHandlerAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java b/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java index 138ebbc..172f6ed 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java @@ -11,9 +11,9 @@ import org.chromium.base.CalledByNative; */ public class Profile { - private int mNativeProfileAndroid; + private long mNativeProfileAndroid; - private Profile(int nativeProfileAndroid) { + private Profile(long nativeProfileAndroid) { mNativeProfileAndroid = nativeProfileAndroid; } @@ -22,7 +22,7 @@ public class Profile { } @CalledByNative - private static Profile create(int nativeProfileAndroid) { + private static Profile create(long nativeProfileAndroid) { return new Profile(nativeProfileAndroid); } @@ -32,7 +32,7 @@ public class Profile { } @CalledByNative - private int getNativePointer() { + private long getNativePointer() { return mNativeProfileAndroid; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java index c80a4e3..e258bc3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java @@ -68,7 +68,7 @@ public class TemplateUrlService { return sService; } - private final int mNativeTemplateUrlServiceAndroid; + private final long mNativeTemplateUrlServiceAndroid; private final ObserverList<LoadListener> mLoadListeners = new ObserverList<LoadListener>(); private TemplateUrlService() { @@ -204,20 +204,20 @@ public class TemplateUrlService { return nativeReplaceSearchTermsInUrl(mNativeTemplateUrlServiceAndroid, query, url); } - private native int nativeInit(); - private native void nativeLoad(int nativeTemplateUrlServiceAndroid); - private native boolean nativeIsLoaded(int nativeTemplateUrlServiceAndroid); - private native int nativeGetTemplateUrlCount(int nativeTemplateUrlServiceAndroid); + private native long nativeInit(); + private native void nativeLoad(long nativeTemplateUrlServiceAndroid); + private native boolean nativeIsLoaded(long nativeTemplateUrlServiceAndroid); + private native int nativeGetTemplateUrlCount(long nativeTemplateUrlServiceAndroid); private native TemplateUrl nativeGetPrepopulatedTemplateUrlAt( - int nativeTemplateUrlServiceAndroid, int i); - private native void nativeSetDefaultSearchProvider(int nativeTemplateUrlServiceAndroid, + long nativeTemplateUrlServiceAndroid, int i); + private native void nativeSetDefaultSearchProvider(long nativeTemplateUrlServiceAndroid, int selectedIndex); - private native int nativeGetDefaultSearchProvider(int nativeTemplateUrlServiceAndroid); - private native boolean nativeIsSearchProviderManaged(int nativeTemplateUrlServiceAndroid); - private native boolean nativeIsSearchByImageAvailable(int nativeTemplateUrlServiceAndroid); - private native boolean nativeIsDefaultSearchEngineGoogle(int nativeTemplateUrlServiceAndroid); - private native String nativeGetUrlForSearchQuery(int nativeTemplateUrlServiceAndroid, + private native int nativeGetDefaultSearchProvider(long nativeTemplateUrlServiceAndroid); + private native boolean nativeIsSearchProviderManaged(long nativeTemplateUrlServiceAndroid); + private native boolean nativeIsSearchByImageAvailable(long nativeTemplateUrlServiceAndroid); + private native boolean nativeIsDefaultSearchEngineGoogle(long nativeTemplateUrlServiceAndroid); + private native String nativeGetUrlForSearchQuery(long nativeTemplateUrlServiceAndroid, String query); - private native String nativeReplaceSearchTermsInUrl(int nativeTemplateUrlServiceAndroid, + private native String nativeReplaceSearchTermsInUrl(long nativeTemplateUrlServiceAndroid, String query, String currentUrl); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java index 6f50e49..2e5daa8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java @@ -41,10 +41,10 @@ public final class OAuth2TokenService { private static final String OAUTH2_SCOPE_PREFIX = "oauth2:"; - private final int mNativeProfileOAuth2TokenService; + private final long mNativeProfileOAuth2TokenService; private final ObserverList<OAuth2TokenServiceObserver> mObservers; - private OAuth2TokenService(int nativeOAuth2Service) { + private OAuth2TokenService(long nativeOAuth2Service) { mNativeProfileOAuth2TokenService = nativeOAuth2Service; mObservers = new ObserverList<OAuth2TokenServiceObserver>(); } @@ -55,7 +55,7 @@ public final class OAuth2TokenService { } @CalledByNative - private static OAuth2TokenService create(int nativeOAuth2Service) { + private static OAuth2TokenService create(long nativeOAuth2Service) { ThreadUtils.assertOnUiThread(); return new OAuth2TokenService(nativeOAuth2Service); } @@ -104,7 +104,7 @@ public final class OAuth2TokenService { */ @CalledByNative public static void getOAuth2AuthToken( - Context context, String username, String scope, final int nativeCallback) { + Context context, String username, String scope, final long nativeCallback) { Account account = getAccountOrNullFromUsername(context, username); if (account == null) { nativeOAuth2TokenFetched(null, false, nativeCallback); @@ -264,13 +264,14 @@ public final class OAuth2TokenService { private static native Object nativeGetForProfile(Profile profile); private static native void nativeOAuth2TokenFetched( - String authToken, boolean result, int nativeCallback); - private native void nativeValidateAccounts(int nativeAndroidProfileOAuth2TokenService, - String[] accounts, String currentlySignedInAccount); + String authToken, boolean result, long nativeCallback); + private native void nativeValidateAccounts( + long nativeAndroidProfileOAuth2TokenService, + String[] accounts, String currentlySignedInAccount); private native void nativeFireRefreshTokenAvailableFromJava( - int nativeAndroidProfileOAuth2TokenService, String accountName); + long nativeAndroidProfileOAuth2TokenService, String accountName); private native void nativeFireRefreshTokenRevokedFromJava( - int nativeAndroidProfileOAuth2TokenService, String accountName); + long nativeAndroidProfileOAuth2TokenService, String accountName); private native void nativeFireRefreshTokensLoadedFromJava( - int nativeAndroidProfileOAuth2TokenService); + long nativeAndroidProfileOAuth2TokenService); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java index bd86a48..dfca176 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java @@ -42,7 +42,7 @@ public class SigninManager { private static SigninManager sSigninManager; private final Context mContext; - private final int mNativeSigninManagerAndroid; + private final long mNativeSigninManagerAndroid; /** Tracks whether the First Run check has been completed. * @@ -378,14 +378,14 @@ public class SigninManager { } // Native methods. - private native int nativeInit(); + private native long nativeInit(); private native boolean nativeShouldLoadPolicyForUser(String username); private native void nativeCheckPolicyBeforeSignIn( - int nativeSigninManagerAndroid, String username); - private native void nativeFetchPolicyBeforeSignIn(int nativeSigninManagerAndroid); - private native void nativeOnSignInCompleted(int nativeSigninManagerAndroid, String username); - private native void nativeSignOut(int nativeSigninManagerAndroid); - private native String nativeGetManagementDomain(int nativeSigninManagerAndroid); - private native void nativeWipeProfileData(int nativeSigninManagerAndroid); - private native void nativeLogInSignedInUser(int nativeSigninManagerAndroid); + long nativeSigninManagerAndroid, String username); + private native void nativeFetchPolicyBeforeSignIn(long nativeSigninManagerAndroid); + private native void nativeOnSignInCompleted(long nativeSigninManagerAndroid, String username); + private native void nativeSignOut(long nativeSigninManagerAndroid); + private native String nativeGetManagementDomain(long nativeSigninManagerAndroid); + private native void nativeWipeProfileData(long nativeSigninManagerAndroid); + private native void nativeLogInSignedInUser(long nativeSigninManagerAndroid); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java index 0e04a9e..b28a487 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java @@ -53,7 +53,7 @@ public class ProfileSyncService { new CopyOnWriteArrayList<SyncStateChangedListener>(); // Native ProfileSyncServiceAndroid object. Can not be final since we set it to 0 in destroy(). - private final int mNativeProfileSyncServiceAndroid; + private final long mNativeProfileSyncServiceAndroid; /** * A helper method for retrieving the application-wide SyncSetupManager. @@ -86,7 +86,7 @@ public class ProfileSyncService { } @CalledByNative - private static int getProfileSyncServiceAndroid(Context context) { + private static long getProfileSyncServiceAndroid(Context context) { return get(context).mNativeProfileSyncServiceAndroid; } @@ -503,52 +503,53 @@ public class ProfileSyncService { // Native methods private native void nativeNudgeSyncer( - int nativeProfileSyncServiceAndroid, int objectSource, String objectId, long version, + long nativeProfileSyncServiceAndroid, int objectSource, String objectId, long version, String payload); - private native void nativeNudgeSyncerForAllTypes(int nativeProfileSyncServiceAndroid); - private native int nativeInit(); - private native void nativeEnableSync(int nativeProfileSyncServiceAndroid); - private native void nativeDisableSync(int nativeProfileSyncServiceAndroid); - private native void nativeSignInSync(int nativeProfileSyncServiceAndroid); - private native void nativeSignOutSync(int nativeProfileSyncServiceAndroid); - private native boolean nativeSetSyncSessionsId(int nativeProfileSyncServiceAndroid, String tag); - private native String nativeQuerySyncStatusSummary(int nativeProfileSyncServiceAndroid); - private native int nativeGetAuthError(int nativeProfileSyncServiceAndroid); - private native boolean nativeIsSyncInitialized(int nativeProfileSyncServiceAndroid); - private native boolean nativeIsFirstSetupInProgress(int nativeProfileSyncServiceAndroid); - private native boolean nativeIsEncryptEverythingEnabled(int nativeProfileSyncServiceAndroid); - private native void nativeEnableEncryptEverything(int nativeProfileSyncServiceAndroid); + private native void nativeNudgeSyncerForAllTypes(long nativeProfileSyncServiceAndroid); + private native long nativeInit(); + private native void nativeEnableSync(long nativeProfileSyncServiceAndroid); + private native void nativeDisableSync(long nativeProfileSyncServiceAndroid); + private native void nativeSignInSync(long nativeProfileSyncServiceAndroid); + private native void nativeSignOutSync(long nativeProfileSyncServiceAndroid); + private native boolean nativeSetSyncSessionsId( + long nativeProfileSyncServiceAndroid, String tag); + private native String nativeQuerySyncStatusSummary(long nativeProfileSyncServiceAndroid); + private native int nativeGetAuthError(long nativeProfileSyncServiceAndroid); + private native boolean nativeIsSyncInitialized(long nativeProfileSyncServiceAndroid); + private native boolean nativeIsFirstSetupInProgress(long nativeProfileSyncServiceAndroid); + private native boolean nativeIsEncryptEverythingEnabled(long nativeProfileSyncServiceAndroid); + private native void nativeEnableEncryptEverything(long nativeProfileSyncServiceAndroid); private native boolean nativeIsPassphraseRequiredForDecryption( - int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid); private native boolean nativeIsPassphraseRequiredForExternalType( - int nativeProfileSyncServiceAndroid); - private native boolean nativeIsUsingSecondaryPassphrase(int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid); + private native boolean nativeIsUsingSecondaryPassphrase(long nativeProfileSyncServiceAndroid); private native boolean nativeSetDecryptionPassphrase( - int nativeProfileSyncServiceAndroid, String passphrase); + long nativeProfileSyncServiceAndroid, String passphrase); private native void nativeSetEncryptionPassphrase( - int nativeProfileSyncServiceAndroid, String passphrase, boolean isGaia); - private native boolean nativeIsCryptographerReady(int nativeProfileSyncServiceAndroid); - private native int nativeGetPassphraseType(int nativeProfileSyncServiceAndroid); - private native boolean nativeHasExplicitPassphraseTime(int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid, String passphrase, boolean isGaia); + private native boolean nativeIsCryptographerReady(long nativeProfileSyncServiceAndroid); + private native int nativeGetPassphraseType(long nativeProfileSyncServiceAndroid); + private native boolean nativeHasExplicitPassphraseTime(long nativeProfileSyncServiceAndroid); private native String nativeGetSyncEnterGooglePassphraseBodyWithDateText( - int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid); private native String nativeGetSyncEnterCustomPassphraseBodyWithDateText( - int nativeProfileSyncServiceAndroid); - private native String nativeGetCurrentSignedInAccountText(int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid); + private native String nativeGetCurrentSignedInAccountText(long nativeProfileSyncServiceAndroid); private native String nativeGetSyncEnterCustomPassphraseBodyText( - int nativeProfileSyncServiceAndroid); - private native boolean nativeIsSyncKeystoreMigrationDone(int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid); + private native boolean nativeIsSyncKeystoreMigrationDone(long nativeProfileSyncServiceAndroid); private native long nativeGetEnabledDataTypes( - int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid); private native void nativeSetPreferredDataTypes( - int nativeProfileSyncServiceAndroid, boolean syncEverything, long modelTypeSelection); + long nativeProfileSyncServiceAndroid, boolean syncEverything, long modelTypeSelection); private native void nativeSetSetupInProgress( - int nativeProfileSyncServiceAndroid, boolean inProgress); - private native void nativeSetSyncSetupCompleted(int nativeProfileSyncServiceAndroid); - private native boolean nativeHasSyncSetupCompleted(int nativeProfileSyncServiceAndroid); - private native boolean nativeIsStartSuppressed(int nativeProfileSyncServiceAndroid); - private native boolean nativeHasKeepEverythingSynced(int nativeProfileSyncServiceAndroid); - private native boolean nativeHasUnrecoverableError(int nativeProfileSyncServiceAndroid); - private native String nativeGetAboutInfoForTest(int nativeProfileSyncServiceAndroid); - private native long nativeGetLastSyncedTimeForTest(int nativeProfileSyncServiceAndroid); + long nativeProfileSyncServiceAndroid, boolean inProgress); + private native void nativeSetSyncSetupCompleted(long nativeProfileSyncServiceAndroid); + private native boolean nativeHasSyncSetupCompleted(long nativeProfileSyncServiceAndroid); + private native boolean nativeIsStartSuppressed(long nativeProfileSyncServiceAndroid); + private native boolean nativeHasKeepEverythingSynced(long nativeProfileSyncServiceAndroid); + private native boolean nativeHasUnrecoverableError(long nativeProfileSyncServiceAndroid); + private native String nativeGetAboutInfoForTest(long nativeProfileSyncServiceAndroid); + private native long nativeGetLastSyncedTimeForTest(long nativeProfileSyncServiceAndroid); } diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java index 52770a3..8551d26 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java @@ -72,7 +72,7 @@ public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase { UiUtils.runOnUiThread(getActivity(), new Runnable() { @Override public void run() { - int nativeWebContents = ContentViewUtil.createNativeWebContents(false); + long nativeWebContents = ContentViewUtil.createNativeWebContents(false); WindowAndroid windowAndroid = new ActivityWindowAndroid(getActivity()); ContentView contentView = ContentView.newInstance( getActivity(), nativeWebContents, windowAndroid); diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java index 9c4c3a3..5f294b0 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java @@ -53,7 +53,7 @@ public class ExternalPrerenderRequestTest extends ChromiumTestShellTestBase { * Test adding a prerender and canceling that to add a new one. */ public void testAddPrerenderAndCancel() throws InterruptedException { - int webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); + long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( mProfile, GOOGLE_URL, webContentsPtr)); @@ -76,7 +76,7 @@ public class ExternalPrerenderRequestTest extends ChromiumTestShellTestBase { */ public void testCancelPrerender() { mHandler.cancelCurrentPrerender(); - int webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); + long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( mProfile, GOOGLE_URL, webContentsPtr)); } @@ -88,11 +88,11 @@ public class ExternalPrerenderRequestTest extends ChromiumTestShellTestBase { * Test adding two prerenders without canceling the first one. */ public void testAddingPrerendersInaRow() throws InterruptedException { - int webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); + long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( mProfile, GOOGLE_URL, webContentsPtr)); Thread.sleep(PRERENDER_DELAY_MS); - int newWebContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0); + long newWebContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0); assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( mProfile, YOUTUBE_URL, newWebContentsPtr)); } diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java index c19103c..846588f 100644 --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java @@ -19,7 +19,7 @@ import org.chromium.ui.base.WindowAndroid; * and extends {@link TabBase}. */ public class TestShellTab extends TabBase { - private int mNativeTestShellTab; + private long mNativeTestShellTab; private CleanupReference mCleanupReference; @@ -103,8 +103,8 @@ public class TestShellTab extends TabBase { } private static final class DestroyRunnable implements Runnable { - private final int mNativeTestShellTab; - private DestroyRunnable(int nativeTestShellTab) { + private final long mNativeTestShellTab; + private DestroyRunnable(long nativeTestShellTab) { mNativeTestShellTab = nativeTestShellTab; } @Override @@ -139,7 +139,7 @@ public class TestShellTab extends TabBase { } } - private native int nativeInit(); - private static native void nativeDestroy(int nativeTestShellTab); - private native String nativeFixupUrl(int nativeTestShellTab, String url); + private native long nativeInit(); + private static native void nativeDestroy(long nativeTestShellTab); + private native String nativeFixupUrl(long nativeTestShellTab, String url); } diff --git a/chrome/android/testshell/testshell_tab.cc b/chrome/android/testshell/testshell_tab.cc index 6e94ea5..168875d 100644 --- a/chrome/android/testshell/testshell_tab.cc +++ b/chrome/android/testshell/testshell_tab.cc @@ -95,6 +95,6 @@ ScopedJavaLocalRef<jstring> TestShellTab::FixupUrl(JNIEnv* env, return ConvertUTF8ToJavaString(env, fixed_spec); } -static jint Init(JNIEnv* env, jobject obj) { - return reinterpret_cast<jint>(new TestShellTab(env, obj)); +static jlong Init(JNIEnv* env, jobject obj) { + return reinterpret_cast<intptr_t>(new TestShellTab(env, obj)); } diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc index 576652b..1e6ddf9 100644 --- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc @@ -75,9 +75,9 @@ bool BookmarksBridge::RegisterBookmarksBridge(JNIEnv* env) { return RegisterNativesImpl(env); } -static jint Init(JNIEnv* env, jobject obj, jobject j_profile) { +static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) { BookmarksBridge* delegate = new BookmarksBridge(env, obj, j_profile); - return reinterpret_cast<jint>(delegate); + return reinterpret_cast<intptr_t>(delegate); } static bool IsEditBookmarksEnabled() { diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc index 3c5f49d..3db2bfc 100644 --- a/chrome/browser/android/chrome_web_contents_delegate_android.cc +++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc @@ -307,8 +307,8 @@ void ChromeWebContentsDelegateAndroid::AddNewContents( handled = Java_ChromeWebContentsDelegateAndroid_addNewContents( env, obj.obj(), - reinterpret_cast<jint>(source), - reinterpret_cast<jint>(new_contents), + reinterpret_cast<intptr_t>(source), + reinterpret_cast<intptr_t>(new_contents), static_cast<jint>(disposition), NULL, user_gesture); diff --git a/chrome/browser/android/content_view_util.cc b/chrome/browser/android/content_view_util.cc index 2acdb1e..95ab743 100644 --- a/chrome/browser/android/content_view_util.cc +++ b/chrome/browser/android/content_view_util.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "jni/ContentViewUtil_jni.h" -static jint CreateNativeWebContents( +static jlong CreateNativeWebContents( JNIEnv* env, jclass clazz, jboolean incognito) { Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); if (incognito) @@ -19,11 +19,11 @@ static jint CreateNativeWebContents( content::WebContents* web_contents = content::WebContents::Create(content::WebContents::CreateParams(profile)); - return reinterpret_cast<jint>(web_contents); + return reinterpret_cast<intptr_t>(web_contents); } static void DestroyNativeWebContents( - JNIEnv* env, jclass clazz, jint web_contents_ptr) { + JNIEnv* env, jclass clazz, jlong web_contents_ptr) { content::WebContents* web_contents = reinterpret_cast<content::WebContents*>(web_contents_ptr); delete web_contents; diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc index 17a4660..2413dde 100644 --- a/chrome/browser/android/favicon_helper.cc +++ b/chrome/browser/android/favicon_helper.cc @@ -58,8 +58,8 @@ void OnLocalFaviconAvailable( } // namespace -static jint Init(JNIEnv* env, jclass clazz) { - return reinterpret_cast<jint>(new FaviconHelper()); +static jlong Init(JNIEnv* env, jclass clazz) { + return reinterpret_cast<intptr_t>(new FaviconHelper()); } FaviconHelper::FaviconHelper() { diff --git a/chrome/browser/android/foreign_session_helper.cc b/chrome/browser/android/foreign_session_helper.cc index 58a4675..4fccf57 100644 --- a/chrome/browser/android/foreign_session_helper.cc +++ b/chrome/browser/android/foreign_session_helper.cc @@ -137,10 +137,10 @@ void CopyWindowsToJava( } // namespace -static jint Init(JNIEnv* env, jclass clazz, jobject profile) { +static jlong Init(JNIEnv* env, jclass clazz, jobject profile) { ForeignSessionHelper* foreign_session_helper = new ForeignSessionHelper( ProfileAndroid::FromProfileAndroid(profile)); - return reinterpret_cast<jint>(foreign_session_helper); + return reinterpret_cast<intptr_t>(foreign_session_helper); } ForeignSessionHelper::ForeignSessionHelper(Profile* profile) diff --git a/chrome/browser/android/new_tab_page_prefs.cc b/chrome/browser/android/new_tab_page_prefs.cc index be28961..94a4e75 100644 --- a/chrome/browser/android/new_tab_page_prefs.cc +++ b/chrome/browser/android/new_tab_page_prefs.cc @@ -16,10 +16,10 @@ using base::android::ConvertJavaStringToUTF8; -static jint Init(JNIEnv* env, jclass clazz, jobject profile) { +static jlong Init(JNIEnv* env, jclass clazz, jobject profile) { NewTabPagePrefs* new_tab_page_prefs = new NewTabPagePrefs(ProfileAndroid::FromProfileAndroid(profile)); - return reinterpret_cast<jint>(new_tab_page_prefs); + return reinterpret_cast<intptr_t>(new_tab_page_prefs); } NewTabPagePrefs::NewTabPagePrefs(Profile* profile) diff --git a/chrome/browser/android/omnibox/omnibox_prerender.cc b/chrome/browser/android/omnibox/omnibox_prerender.cc index 216a719..ac06465 100644 --- a/chrome/browser/android/omnibox/omnibox_prerender.cc +++ b/chrome/browser/android/omnibox/omnibox_prerender.cc @@ -27,9 +27,9 @@ OmniboxPrerender::OmniboxPrerender(JNIEnv* env, jobject obj) OmniboxPrerender::~OmniboxPrerender() { } -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { OmniboxPrerender* omnibox = new OmniboxPrerender(env, obj); - return reinterpret_cast<jint>(omnibox); + return reinterpret_cast<intptr_t>(omnibox); } bool RegisterOmniboxPrerender(JNIEnv* env) { diff --git a/chrome/browser/android/password_ui_view_android.cc b/chrome/browser/android/password_ui_view_android.cc index 966e7f5..c5db384 100644 --- a/chrome/browser/android/password_ui_view_android.cc +++ b/chrome/browser/android/password_ui_view_android.cc @@ -86,9 +86,9 @@ void PasswordUIViewAndroid::HandleRemoveSavedPasswordException( } // static -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj); - return reinterpret_cast<jint>(controller); + return reinterpret_cast<intptr_t>(controller); } bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) { diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 800effc..fdad6c8 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -1143,9 +1143,9 @@ void FillSearchRow(JNIEnv* env, // ------------- Native initialization and destruction ------------- // -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { ChromeBrowserProvider* provider = new ChromeBrowserProvider(env, obj); - return reinterpret_cast<jint>(provider); + return reinterpret_cast<intptr_t>(provider); } bool ChromeBrowserProvider::RegisterChromeBrowserProvider(JNIEnv* env) { diff --git a/chrome/browser/android/recently_closed_tabs_bridge.cc b/chrome/browser/android/recently_closed_tabs_bridge.cc index fd72173..636e25a 100644 --- a/chrome/browser/android/recently_closed_tabs_bridge.cc +++ b/chrome/browser/android/recently_closed_tabs_bridge.cc @@ -153,10 +153,10 @@ void RecentlyClosedTabsBridge::EnsureTabRestoreService() { } } -static jint Init(JNIEnv* env, jobject obj, jobject jprofile) { +static jlong Init(JNIEnv* env, jobject obj, jobject jprofile) { RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge( ProfileAndroid::FromProfileAndroid(jprofile)); - return reinterpret_cast<jint>(bridge); + return reinterpret_cast<intptr_t>(bridge); } // static diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc index 562d2a9..8025b93 100644 --- a/chrome/browser/android/shortcut_helper.cc +++ b/chrome/browser/android/shortcut_helper.cc @@ -205,7 +205,7 @@ void ShortcutHelper::AddShortcutInBackground( // its otherwise inaccessible WebContents. static void AddShortcut(JNIEnv* env, jclass clazz, - jint tab_android_ptr, + jlong tab_android_ptr, jstring title, jint launcher_large_icon_size) { TabAndroid* tab = reinterpret_cast<TabAndroid*>(tab_android_ptr); diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index ac761d4..8cd2b7e 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc @@ -210,10 +210,10 @@ void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) { autoLogin->LogIn(); } -static int Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { SigninManagerAndroid* signin_manager_android = new SigninManagerAndroid(env, obj); - return reinterpret_cast<jint>(signin_manager_android); + return reinterpret_cast<intptr_t>(signin_manager_android); } static jboolean ShouldLoadPolicyForUser(JNIEnv* env, diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc index ce9805a..3a5bb7a 100644 --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc @@ -147,7 +147,7 @@ TabAndroid::TabAndroid(JNIEnv* env, jobject obj) : weak_java_tab_(env, obj), session_tab_id_(), synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) { - Java_TabBase_setNativePtr(env, obj, reinterpret_cast<jint>(this)); + Java_TabBase_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this)); } TabAndroid::~TabAndroid() { @@ -245,7 +245,7 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents, Java_TabBase_swapWebContents( env, weak_java_tab_.get(env).obj(), - reinterpret_cast<jint>(new_contents)); + reinterpret_cast<intptr_t>(new_contents)); } void TabAndroid::Observe(int type, diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc index b0f6049..364ccad 100644 --- a/chrome/browser/autofill/android/personal_data_manager_android.cc +++ b/chrome/browser/autofill/android/personal_data_manager_android.cc @@ -313,10 +313,10 @@ static jstring ToCountryCode(JNIEnv* env, jclass clazz, jstring jcountry_name) { g_browser_process->GetApplicationLocale())).Release(); } -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { PersonalDataManagerAndroid* personal_data_manager_android = new PersonalDataManagerAndroid(env, obj); - return reinterpret_cast<jint>(personal_data_manager_android); + return reinterpret_cast<intptr_t>(personal_data_manager_android); } } // namespace autofill diff --git a/chrome/browser/history/android/sqlite_cursor.cc b/chrome/browser/history/android/sqlite_cursor.cc index 4bf584a..36cc882 100644 --- a/chrome/browser/history/android/sqlite_cursor.cc +++ b/chrome/browser/history/android/sqlite_cursor.cc @@ -55,7 +55,7 @@ ScopedJavaLocalRef<jobject> SQLiteCursor::NewJavaSqliteCursor( FaviconService* favicon_service) { SQLiteCursor* cursor = new SQLiteCursor(column_names, statement, service, favicon_service); - return Java_SQLiteCursor_create(env, reinterpret_cast<jint>(cursor)); + return Java_SQLiteCursor_create(env, reinterpret_cast<intptr_t>(cursor)); } bool SQLiteCursor::RegisterSqliteCursor(JNIEnv* env) { diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc index 10be12a..497d4cb 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc @@ -291,8 +291,8 @@ std::string DataReductionProxySettingsAndroid::GetProxyPacScript() { } // Used by generated jni code. -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { DataReductionProxySettingsAndroid* settings = new DataReductionProxySettingsAndroid(env, obj); - return reinterpret_cast<jint>(settings); + return reinterpret_cast<intptr_t>(settings); } diff --git a/chrome/browser/prerender/external_prerender_handler_android.cc b/chrome/browser/prerender/external_prerender_handler_android.cc index 1a0a06b..013873b 100644 --- a/chrome/browser/prerender/external_prerender_handler_android.cc +++ b/chrome/browser/prerender/external_prerender_handler_android.cc @@ -25,7 +25,7 @@ namespace prerender { bool ExternalPrerenderHandlerAndroid::AddPrerender(JNIEnv* env, jobject obj, jobject jprofile, - jint web_contents_ptr, + jlong web_contents_ptr, jstring jurl, jstring jreferrer, jint width, @@ -72,7 +72,7 @@ static jboolean HasPrerenderedUrl(JNIEnv* env, jclass clazz, jobject jprofile, jstring jurl, - jint web_contents_ptr) { + jlong web_contents_ptr) { if (jurl == NULL) return false; @@ -93,10 +93,10 @@ ExternalPrerenderHandlerAndroid::ExternalPrerenderHandlerAndroid() {} ExternalPrerenderHandlerAndroid::~ExternalPrerenderHandlerAndroid() {} -static jint Init(JNIEnv* env, jclass clazz) { +static jlong Init(JNIEnv* env, jclass clazz) { ExternalPrerenderHandlerAndroid* external_handler = new ExternalPrerenderHandlerAndroid(); - return reinterpret_cast<jint>(external_handler); + return reinterpret_cast<intptr_t>(external_handler); } bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( diff --git a/chrome/browser/prerender/external_prerender_handler_android.h b/chrome/browser/prerender/external_prerender_handler_android.h index f7dedb4..111181c 100644 --- a/chrome/browser/prerender/external_prerender_handler_android.h +++ b/chrome/browser/prerender/external_prerender_handler_android.h @@ -30,7 +30,7 @@ class ExternalPrerenderHandlerAndroid { bool AddPrerender(JNIEnv* env, jobject obj, jobject profile, - jint web_content_ptr, + jlong web_content_ptr, jstring url, jstring referrer, jint width, diff --git a/chrome/browser/profiles/profile_android.cc b/chrome/browser/profiles/profile_android.cc index 5f0eda1..0496675 100644 --- a/chrome/browser/profiles/profile_android.cc +++ b/chrome/browser/profiles/profile_android.cc @@ -72,7 +72,7 @@ ProfileAndroid::ProfileAndroid(Profile* profile) : profile_(profile) { JNIEnv* env = AttachCurrentThread(); base::android::ScopedJavaLocalRef<jobject> jprofile = - Java_Profile_create(env, reinterpret_cast<int>(this)); + Java_Profile_create(env, reinterpret_cast<intptr_t>(this)); obj_.Reset(env, jprofile.obj()); } diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc index 783725b..7bd4172 100644 --- a/chrome/browser/search_engines/template_url_service_android.cc +++ b/chrome/browser/search_engines/template_url_service_android.cc @@ -175,10 +175,10 @@ TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl(JNIEnv* env, return base::android::ScopedJavaLocalRef<jstring>(env, NULL); } -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { TemplateUrlServiceAndroid* template_url_service_android = new TemplateUrlServiceAndroid(env, obj); - return reinterpret_cast<jint>(template_url_service_android); + return reinterpret_cast<intptr_t>(template_url_service_android); } // static diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.cc b/chrome/browser/signin/android_profile_oauth2_token_service.cc index 60d378d..ae44714 100644 --- a/chrome/browser/signin/android_profile_oauth2_token_service.cc +++ b/chrome/browser/signin/android_profile_oauth2_token_service.cc @@ -53,7 +53,7 @@ typedef base::Callback<void( AndroidProfileOAuth2TokenService::AndroidProfileOAuth2TokenService() { JNIEnv* env = AttachCurrentThread(); base::android::ScopedJavaLocalRef<jobject> local_java_ref = - Java_OAuth2TokenService_create(env, reinterpret_cast<int>(this)); + Java_OAuth2TokenService_create(env, reinterpret_cast<intptr_t>(this)); java_ref_.Reset(env, local_java_ref.obj()); } @@ -129,7 +129,7 @@ void AndroidProfileOAuth2TokenService::FetchOAuth2Token( env, base::android::GetApplicationContext(), j_username.obj(), j_scope.obj(), - reinterpret_cast<int>(heap_callback.release())); + reinterpret_cast<intptr_t>(heap_callback.release())); } void AndroidProfileOAuth2TokenService::InvalidateOAuth2Token( @@ -235,7 +235,7 @@ void AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded() { void OAuth2TokenFetched(JNIEnv* env, jclass clazz, jstring authToken, jboolean result, - jint nativeCallback) { + jlong nativeCallback) { std::string token = ConvertJavaStringToUTF8(env, authToken); scoped_ptr<FetchOAuth2TokenCallback> heap_callback( reinterpret_cast<FetchOAuth2TokenCallback*>(nativeCallback)); diff --git a/chrome/browser/speech/tts_android.cc b/chrome/browser/speech/tts_android.cc index 5fbc53b..2ff6eb2 100644 --- a/chrome/browser/speech/tts_android.cc +++ b/chrome/browser/speech/tts_android.cc @@ -24,7 +24,7 @@ TtsPlatformImplAndroid::TtsPlatformImplAndroid() JNIEnv* env = AttachCurrentThread(); java_ref_.Reset( Java_TtsPlatformImpl_create(env, - reinterpret_cast<jint>(this), + reinterpret_cast<intptr_t>(this), base::android::GetApplicationContext())); } diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index 0ab68f2..b1f82f7 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -501,11 +501,11 @@ ProfileSyncServiceAndroid* AttachCurrentThread(), base::android::GetApplicationContext())); } -static int Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { ProfileSyncServiceAndroid* profile_sync_service_android = new ProfileSyncServiceAndroid(env, obj); profile_sync_service_android->Init(); - return reinterpret_cast<jint>(profile_sync_service_android); + return reinterpret_cast<intptr_t>(profile_sync_service_android); } // static diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc index 09b4d9e..066c000 100644 --- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc +++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc @@ -307,7 +307,7 @@ void AutofillDialogControllerAndroid::Show() { env, source_url_.GetOrigin().spec()); java_object_.Reset(Java_AutofillDialogControllerAndroid_create( env, - reinterpret_cast<jint>(this), + reinterpret_cast<intptr_t>(this), WindowAndroidHelper::FromWebContents(contents_)-> GetWindowAndroid()->GetJavaObject().obj(), request_full_billing_address, request_shipping_address, diff --git a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc index 12b8121..be9bcc9 100644 --- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc +++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc @@ -30,7 +30,7 @@ void AutofillPopupViewAndroid::Show() { java_object_.Reset(Java_AutofillPopupGlue_create( env, - reinterpret_cast<jint>(this), + reinterpret_cast<intptr_t>(this), view_android->GetWindowAndroid()->GetJavaObject().obj(), view_android->GetJavaObject().obj())); diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc index 597d8bf..300a6ea 100644 --- a/chrome/browser/ui/android/chrome_http_auth_handler.cc +++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc @@ -32,7 +32,7 @@ void ChromeHttpAuthHandler::Init() { DCHECK(java_chrome_http_auth_handler_.is_null()); JNIEnv* env = AttachCurrentThread(); java_chrome_http_auth_handler_.Reset( - Java_ChromeHttpAuthHandler_create(env, reinterpret_cast<jint>(this))); + Java_ChromeHttpAuthHandler_create(env, reinterpret_cast<intptr_t>(this))); } void ChromeHttpAuthHandler::SetObserver(LoginHandler* observer) { diff --git a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc index 82a9fc8..47b9695 100644 --- a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc +++ b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc @@ -46,7 +46,7 @@ bool AutoLoginInfoBarDelegateAndroid::AttachAccount( DCHECK(delegate.obj()); user_ = base::android::ConvertJavaStringToUTF8( Java_AutoLoginDelegate_initializeAccount( - env, delegate.obj(), reinterpret_cast<jint>(this), jrealm.obj(), + env, delegate.obj(), reinterpret_cast<intptr_t>(this), jrealm.obj(), jaccount.obj(), jargs.obj())); return !user_.empty(); } @@ -63,7 +63,7 @@ bool AutoLoginInfoBarDelegateAndroid::Accept() { DCHECK(delegate.obj()); Java_AutoLoginDelegate_logIn(env, delegate.obj(), - reinterpret_cast<jint>(this)); + reinterpret_cast<intptr_t>(this)); // Do not close the infobar on accept, it will be closed as part // of the log in callback. @@ -76,7 +76,7 @@ bool AutoLoginInfoBarDelegateAndroid::Cancel() { weak_java_auto_login_delegate_.get(env); DCHECK(delegate.obj()); Java_AutoLoginDelegate_cancelLogIn(env, delegate.obj(), - reinterpret_cast<jint>(this)); + reinterpret_cast<intptr_t>(this)); return true; } diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc index a4919e5..702f990 100644 --- a/chrome/browser/ui/android/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc @@ -48,7 +48,7 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar( env, delegate_->GetLinkText()); return Java_ConfirmInfoBarDelegate_showConfirmInfoBar( - env, java_confirm_delegate_.obj(), reinterpret_cast<jint>(this), + env, java_confirm_delegate_.obj(), reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(), message_text.obj(), link_text.obj(), ok_button_text.obj(), cancel_button_text.obj()); } diff --git a/chrome/browser/ui/android/infobars/infobar_container_android.cc b/chrome/browser/ui/android/infobars/infobar_container_android.cc index 42592b9..be77ac8 100644 --- a/chrome/browser/ui/android/infobars/infobar_container_android.cc +++ b/chrome/browser/ui/android/infobars/infobar_container_android.cc @@ -87,15 +87,15 @@ void InfoBarContainerAndroid::PlatformSpecificRemoveInfoBar(InfoBar* infobar) { // Native JNI methods --------------------------------------------------------- -static int Init(JNIEnv* env, - jobject obj, - jint native_web_contents, - jobject auto_login_delegate) { +static jlong Init(JNIEnv* env, + jobject obj, + jlong native_web_contents, + jobject auto_login_delegate) { InfoBarContainerAndroid* infobar_container = new InfoBarContainerAndroid(env, obj, auto_login_delegate); infobar_container->ChangeInfoBarService(InfoBarService::FromWebContents( reinterpret_cast<content::WebContents*>(native_web_contents))); - return reinterpret_cast<int>(infobar_container); + return reinterpret_cast<intptr_t>(infobar_container); } bool RegisterInfoBarContainer(JNIEnv* env) { diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc index a14da81..868cd3d 100644 --- a/chrome/browser/ui/android/infobars/translate_infobar.cc +++ b/chrome/browser/ui/android/infobars/translate_infobar.cc @@ -44,7 +44,7 @@ ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) { return Java_TranslateInfoBarDelegate_showTranslateInfoBar( env, java_translate_delegate_.obj(), - reinterpret_cast<jint>(this), + reinterpret_cast<intptr_t>(this), delegate_->infobar_type(), delegate_->original_language_index(), delegate_->target_language_index(), @@ -109,7 +109,7 @@ void TranslateInfoBar::TransferOwnership( JNIEnv* env = base::android::AttachCurrentThread(); if (Java_TranslateInfoBarDelegate_changeTranslateInfoBarTypeAndPointer( env, java_translate_delegate_.obj(), - reinterpret_cast<jint>(destination), new_type)) { + reinterpret_cast<intptr_t>(destination), new_type)) { ReassignJavaInfoBar(destination); destination->SetJavaDelegate(java_translate_delegate_.Release()); } diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc index 021f823..2e15b99 100644 --- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc +++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc @@ -98,7 +98,7 @@ void JavascriptAppModalDialogAndroid::ShowAppModalDialog() { Java_JavascriptAppModalDialog_showJavascriptAppModalDialog(env, dialog_object.obj(), parent_jobj.obj(), - reinterpret_cast<jint>(this)); + reinterpret_cast<intptr_t>(this)); } void JavascriptAppModalDialogAndroid::ActivateAppModalDialog() { diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc index fca009d..dd9dffd 100644 --- a/chrome/browser/ui/android/navigation_popup.cc +++ b/chrome/browser/ui/android/navigation_popup.cc @@ -86,9 +86,9 @@ static jstring GetHistoryUrl(JNIEnv* env, jclass clazz) { return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL).Release(); } -static jint Init(JNIEnv* env, jobject obj) { +static jlong Init(JNIEnv* env, jobject obj) { NavigationPopup* popup = new NavigationPopup(env, obj); - return reinterpret_cast<jint>(popup); + return reinterpret_cast<intptr_t>(popup); } // static diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc index 4d196b3..8eebb5b 100644 --- a/chrome/browser/ui/android/website_settings_popup_android.cc +++ b/chrome/browser/ui/android/website_settings_popup_android.cc @@ -85,7 +85,7 @@ WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid( popup_jobject_.Reset( Java_WebsiteSettingsPopup_create(env, context, java_content_view, - reinterpret_cast<jint>(this))); + reinterpret_cast<intptr_t>(this))); presenter_.reset(new WebsiteSettings( this, diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 59c0578..3f48d36 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -79,6 +79,7 @@ ], 'variables': { 'jni_gen_package': 'chromium_testshell', + 'jni_generator_ptr_type': 'long', }, 'includes': [ '../build/jni_generator.gypi' ], }, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index f22fd7b..d2e6fb1 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3735,6 +3735,7 @@ ], 'variables': { 'jni_gen_package': 'chrome', + 'jni_generator_ptr_type': 'long', }, 'includes': [ '../build/jni_generator.gypi' ], }, |