now the glue layer implementation landed, make the touch/fav icon methods methods abstract

BUG=


Review URL: https://chromiumcodereview.appspot.com/12703007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188017 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 4 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
index 8b11d2fc..943cf1c 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -272,11 +272,9 @@ public abstract class AwContentsClient extends ContentViewClient {
 
     protected abstract void onCloseWindow();
 
-    // TODO(acleung): Make abstract when landed in Android
-    public void onReceivedTouchIconUrl(String url, boolean precomposed) { }
+    public abstract void onReceivedTouchIconUrl(String url, boolean precomposed);
 
-    // TODO(acleung): Make abstract when landed in Android
-    public void onReceivedIcon(Bitmap bitmap) { }
+    public abstract void onReceivedIcon(Bitmap bitmap);
 
     protected abstract void onRequestFocus();
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java
index d3c207d..a5cb156 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java
@@ -5,6 +5,7 @@
 package org.chromium.android_webview.test;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.graphics.Picture;
 import android.net.http.SslError;
 import android.os.Message;
@@ -149,6 +150,14 @@ class NullContentsClient extends AwContentsClient {
     }
 
     @Override
+    public void onReceivedTouchIconUrl(String url, boolean precomposed) {
+    }
+
+    @Override
+    public void onReceivedIcon(Bitmap bitmap) {
+    }
+
+    @Override
     public void onShowCustomView(View view,
            int requestedOrientation, WebChromeClient.CustomViewCallback callback) {
     }