Move onConsoleMessage implementation to chromium layer

Simple move of small chucnk of code out of glue layer. BUG=464491 Review URL: https://codereview.chromium.org/984273002 Cr-Commit-Position: refs/heads/master@{#319726}
marcosholgado · Mar 9, 2015 · 7b41c65 · 7b41c65
1 parent 5f379e0
commit 7b41c65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -385,10 +385,6 @@ public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
             if (mWebChromeClient != null) {
                 if (TRACE) Log.d(TAG, "onConsoleMessage: " + consoleMessage.message());
                 result = mWebChromeClient.onConsoleMessage(consoleMessage);
-                String message = consoleMessage.message();
-                if (result && message != null && message.startsWith("[blocked]")) {
-                    Log.e(TAG, "Blocked URL: " + message);
-                }
             } else {
                 result = false;
             }

diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
@@ -117,8 +117,12 @@ public boolean addMessageToConsole(int level, String message, int lineNumber,
                 break;
         }
 
-        return mContentsClient.onConsoleMessage(
+        boolean result = mContentsClient.onConsoleMessage(
                 new ConsoleMessage(message, sourceId, lineNumber, messageLevel));
+        if (result && message != null && message.startsWith("[blocked]")) {
+            Log.e(TAG, "Blocked URL: " + message);
+        }
+        return result;
     }
 
     @Override