| Index: content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
|
| ===================================================================
|
| --- content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java (revision 158071)
|
| +++ content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java (working copy)
|
| @@ -15,8 +15,8 @@
|
| public abstract class WebContentsObserverAndroid {
|
| private int mNativeWebContentsObserverAndroid;
|
|
|
| - public WebContentsObserverAndroid(ContentViewCore contentViewCore) {
|
| - mNativeWebContentsObserverAndroid = nativeInit(contentViewCore.getNativeContentViewCore());
|
| + public WebContentsObserverAndroid(int webContentsPtr) {
|
| + mNativeWebContentsObserverAndroid = nativeInit(webContentsPtr);
|
| }
|
|
|
| /**
|
| @@ -47,15 +47,6 @@
|
| }
|
|
|
| /**
|
| - * Called when the main frame of the page has committed.
|
| - * @param url The validated url for the page.
|
| - * @param baseUrl The validated base url for the page.
|
| - */
|
| - @CalledByNative
|
| - public void didNavigateMainFrame(String url, String baseUrl) {
|
| - }
|
| -
|
| - /**
|
| * Destroy the corresponding native object.
|
| */
|
| @CalledByNative
|
| @@ -66,6 +57,6 @@
|
| }
|
| }
|
|
|
| - private native int nativeInit(int contentViewCorePtr);
|
| + private native int nativeInit(int webContentsPtr);
|
| private native void nativeDestroy(int nativeWebContentsObserverAndroid);
|
| }
|
|
|
| Property changes on: content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|