Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 com.android.webview.chromium; | 5 package com.android.webview.chromium; |
| 6 | 6 |
| 7 import android.app.Activity; | 7 import android.app.Activity; |
| 8 import android.content.ActivityNotFoundException; | 8 import android.content.ActivityNotFoundException; |
| 9 import android.content.Context; | 9 import android.content.Context; |
| 10 import android.content.Intent; | 10 import android.content.Intent; |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 377 /** | 377 /** |
| 378 * @see AwContentsClient#onConsoleMessage(android.webkit.ConsoleMessage) | 378 * @see AwContentsClient#onConsoleMessage(android.webkit.ConsoleMessage) |
| 379 */ | 379 */ |
| 380 @Override | 380 @Override |
| 381 public boolean onConsoleMessage(ConsoleMessage consoleMessage) { | 381 public boolean onConsoleMessage(ConsoleMessage consoleMessage) { |
| 382 try { | 382 try { |
| 383 TraceEvent.begin("WebViewContentsClientAdapter.onConsoleMessage"); | 383 TraceEvent.begin("WebViewContentsClientAdapter.onConsoleMessage"); |
| 384 boolean result; | 384 boolean result; |
| 385 if (mWebChromeClient != null) { | 385 if (mWebChromeClient != null) { |
| 386 if (TRACE) Log.d(TAG, "onConsoleMessage: " + consoleMessage.mess age()); | 386 if (TRACE) Log.d(TAG, "onConsoleMessage: " + consoleMessage.mess age()); |
| 387 result = mWebChromeClient.onConsoleMessage(consoleMessage); | 387 return mWebChromeClient.onConsoleMessage(consoleMessage); |
| 388 String message = consoleMessage.message(); | |
| 389 if (result && message != null && message.startsWith("[blocked]") ) { | |
| 390 Log.e(TAG, "Blocked URL: " + message); | |
| 391 } | |
| 392 } else { | 388 } else { |
| 393 result = false; | 389 result = false; |
|
sgurun-gerrit only
2015/03/09 16:41:37
simply return false here and drop result. you can
boliu
2015/03/09 16:46:04
Actually I should keep the old structure. So s/ret
| |
| 394 } | 390 } |
| 395 return result; | 391 return result; |
| 396 } finally { | 392 } finally { |
| 397 TraceEvent.end("WebViewContentsClientAdapter.onConsoleMessage"); | 393 TraceEvent.end("WebViewContentsClientAdapter.onConsoleMessage"); |
| 398 } | 394 } |
| 399 } | 395 } |
| 400 | 396 |
| 401 /** | 397 /** |
| 402 * @see AwContentsClient#onFindResultReceived(int,int,boolean) | 398 * @see AwContentsClient#onFindResultReceived(int,int,boolean) |
| 403 */ | 399 */ |
| (...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1246 else | 1242 else |
| 1247 mAwPermissionRequest.deny(); | 1243 mAwPermissionRequest.deny(); |
| 1248 } | 1244 } |
| 1249 | 1245 |
| 1250 @Override | 1246 @Override |
| 1251 public void deny() { | 1247 public void deny() { |
| 1252 mAwPermissionRequest.deny(); | 1248 mAwPermissionRequest.deny(); |
| 1253 } | 1249 } |
| 1254 } | 1250 } |
| 1255 } | 1251 } |
| OLD | NEW |