| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.android_webview; | 5 package org.chromium.android_webview; |
| 6 | 6 |
| 7 import android.content.ContentResolver; | 7 import android.content.ContentResolver; |
| 8 import android.content.Context; | 8 import android.content.Context; |
| 9 import android.net.Uri; | 9 import android.net.Uri; |
| 10 import android.os.AsyncTask; | 10 import android.os.AsyncTask; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 messageLevel = ConsoleMessage.MessageLevel.WARNING; | 110 messageLevel = ConsoleMessage.MessageLevel.WARNING; |
| 111 break; | 111 break; |
| 112 case LOG_LEVEL_ERROR: | 112 case LOG_LEVEL_ERROR: |
| 113 messageLevel = ConsoleMessage.MessageLevel.ERROR; | 113 messageLevel = ConsoleMessage.MessageLevel.ERROR; |
| 114 break; | 114 break; |
| 115 default: | 115 default: |
| 116 Log.w(TAG, "Unknown message level, defaulting to DEBUG"); | 116 Log.w(TAG, "Unknown message level, defaulting to DEBUG"); |
| 117 break; | 117 break; |
| 118 } | 118 } |
| 119 | 119 |
| 120 return mContentsClient.onConsoleMessage( | 120 boolean result = mContentsClient.onConsoleMessage( |
| 121 new ConsoleMessage(message, sourceId, lineNumber, messageLevel))
; | 121 new ConsoleMessage(message, sourceId, lineNumber, messageLevel))
; |
| 122 if (result && message != null && message.startsWith("[blocked]")) { |
| 123 Log.e(TAG, "Blocked URL: " + message); |
| 124 } |
| 125 return result; |
| 122 } | 126 } |
| 123 | 127 |
| 124 @Override | 128 @Override |
| 125 public void onUpdateUrl(String url) { | 129 public void onUpdateUrl(String url) { |
| 126 // TODO: implement | 130 // TODO: implement |
| 127 } | 131 } |
| 128 | 132 |
| 129 @Override | 133 @Override |
| 130 public void openNewTab(String url, String extraHeaders, byte[] postData, int
disposition, | 134 public void openNewTab(String url, String extraHeaders, byte[] postData, int
disposition, |
| 131 boolean isRendererInitiated) { | 135 boolean isRendererInitiated) { |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 * or an empty string otherwise. | 274 * or an empty string otherwise. |
| 271 */ | 275 */ |
| 272 private String resolveFileName(String filePath) { | 276 private String resolveFileName(String filePath) { |
| 273 if (mContentResolver == null || filePath == null) return ""; | 277 if (mContentResolver == null || filePath == null) return ""; |
| 274 Uri uri = Uri.parse(filePath); | 278 Uri uri = Uri.parse(filePath); |
| 275 return ContentUriUtils.getDisplayName( | 279 return ContentUriUtils.getDisplayName( |
| 276 uri, mContentResolver, MediaStore.MediaColumns.DISPLAY_NAME)
; | 280 uri, mContentResolver, MediaStore.MediaColumns.DISPLAY_NAME)
; |
| 277 } | 281 } |
| 278 } | 282 } |
| 279 } | 283 } |
| OLD | NEW |