[android] Resize the android_webview if it's 0x0 initially.

android_webview/java/src/org/chromium/android_webview/AwContentsClient.java

Index: android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
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 f72a6596fa11d075acbc5271e9d02b68e35c524f..11900556cf566cd9a21cc8d2ee90a70c673f6b5f 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -38,10 +38,6 @@ import org.chromium.net.NetError;
 public abstract class AwContentsClient extends ContentViewClient {

[joth, 2013/03/26 22:12:49]

I'm thinking one of these days we should probably break this inheritance too?

[mkosiba (inactive), 2013/03/27 16:46:41]

probably. ContentViewClient is pretty thin these days though.

 
     private static final String TAG = "AwContentsClient";
-    // Handler for WebContentsDelegate callbacks
-    private final WebContentsDelegateAdapter mWebContentsDelegateAdapter =
-            new WebContentsDelegateAdapter();
-
     private final AwContentsClientCallbackHelper mCallbackHelper =
         new AwContentsClientCallbackHelper(this);
 
@@ -49,116 +45,6 @@ public abstract class AwContentsClient extends ContentViewClient {
 
     private double mDIPScale;
 
-    //--------------------------------------------------------------------------------------------
-    //                        Adapter for WebContentsDelegate methods.
-    //--------------------------------------------------------------------------------------------
-    class WebContentsDelegateAdapter extends AwWebContentsDelegate {
-
-        @Override
-        public void onLoadProgressChanged(int progress) {
-            AwContentsClient.this.onProgressChanged(progress);
-        }
-
-        @Override
-        public void handleKeyboardEvent(KeyEvent event) {
-            AwContentsClient.this.onUnhandledKeyEvent(event);
-        }
-
-        @Override
-        public boolean addMessageToConsole(int level, String message, int lineNumber,
-                String sourceId) {
-            ConsoleMessage.MessageLevel messageLevel = ConsoleMessage.MessageLevel.DEBUG;
-            switch(level) {
-                case LOG_LEVEL_TIP:
-                    messageLevel = ConsoleMessage.MessageLevel.TIP;
-                    break;
-                case LOG_LEVEL_LOG:
-                    messageLevel = ConsoleMessage.MessageLevel.LOG;
-                    break;
-                case LOG_LEVEL_WARNING:
-                    messageLevel = ConsoleMessage.MessageLevel.WARNING;
-                    break;
-                case LOG_LEVEL_ERROR:
-                    messageLevel = ConsoleMessage.MessageLevel.ERROR;
-                    break;
-                default:
-                    Log.w(TAG, "Unknown message level, defaulting to DEBUG");
-                    break;
-            }
-
-            return AwContentsClient.this.onConsoleMessage(
-                    new ConsoleMessage(message, sourceId, lineNumber, messageLevel));
-        }
-
-        @Override
-        public void onUpdateUrl(String url) {
-            // TODO: implement
-        }
-
-        @Override
-        public void openNewTab(String url, boolean incognito) {
-            // TODO: implement
-        }
-
-        @Override
-        public boolean addNewContents(int nativeSourceWebContents, int nativeWebContents,
-                int disposition, Rect initialPosition, boolean userGesture) {
-            // TODO: implement
-            return false;
-        }
-
-        @Override
-        public void closeContents() {
-            AwContentsClient.this.onCloseWindow();
-        }
-
-        @Override
-        public void showRepostFormWarningDialog(final ContentViewCore contentViewCore) {
-            // This is intentionally not part of mCallbackHelper as that class is intended for
-            // callbacks going the other way (to the embedder, not from the embedder).
-            // TODO(mkosiba) We should be using something akin to the JsResultReceiver as the
-            // callback parameter (instead of ContentViewCore) and implement a way of converting
-            // that to a pair of messages.
-            final int MSG_CONTINUE_PENDING_RELOAD = 1;
-            final int MSG_CANCEL_PENDING_RELOAD = 2;
-
-            // TODO(sgurun) Remember the URL to cancel the reload behavior
-            // if it is different than the most recent NavigationController entry.
-            final Handler handler = new Handler(Looper.getMainLooper()) {
-                @Override
-                public void handleMessage(Message msg) {
-                    switch(msg.what) {
-                        case MSG_CONTINUE_PENDING_RELOAD: {
-                            contentViewCore.continuePendingReload();
-                            break;
-                        }
-                        case MSG_CANCEL_PENDING_RELOAD: {
-                            contentViewCore.cancelPendingReload();
-                            break;
-                        }
-                        default:
-                            throw new IllegalStateException(
-                                    "WebContentsDelegateAdapter: unhandled message " + msg.what);
-                    }
-                }
-            };
-
-            Message resend = handler.obtainMessage(MSG_CONTINUE_PENDING_RELOAD);
-            Message dontResend = handler.obtainMessage(MSG_CANCEL_PENDING_RELOAD);
-            AwContentsClient.this.onFormResubmission(dontResend, resend);
-        }
-
-        @Override
-        public boolean addNewContents(boolean isDialog, boolean isUserGesture) {
-            return AwContentsClient.this.onCreateWindow(isDialog, isUserGesture);
-        }
-
-        @Override
-        public void activateContents() {
-            AwContentsClient.this.onRequestFocus();
-        }
-    }
-
     class AwWebContentsObserver extends WebContentsObserverAndroid {
         public AwWebContentsObserver(ContentViewCore contentViewCore) {
             super(contentViewCore);
@@ -207,10 +93,6 @@ public abstract class AwContentsClient extends ContentViewClient {
         mDIPScale = dipScale;
     }
 
-    final AwWebContentsDelegate getWebContentsDelegate() {
-        return mWebContentsDelegateAdapter;
-    }
-
     final AwContentsClientCallbackHelper getCallbackHelper() {
         return mCallbackHelper;
     }