| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
|
| index d18b1df8b7a47db5d403319619309fa4ec8ef6ad..790fea00ae476da6cdc18e14cffbc9c353b490c4 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
|
| @@ -57,10 +57,9 @@ public class ContentViewClient {
|
| if (!shouldPropagateKey(keyCode)) return true;
|
|
|
| // We also have to intercept some shortcuts before we send them to the ContentView.
|
| - if (event.isCtrlPressed() && (
|
| - keyCode == KeyEvent.KEYCODE_TAB ||
|
| - keyCode == KeyEvent.KEYCODE_W ||
|
| - keyCode == KeyEvent.KEYCODE_F4)) {
|
| + if (event.isCtrlPressed() && (keyCode == KeyEvent.KEYCODE_TAB
|
| + || keyCode == KeyEvent.KEYCODE_W
|
| + || keyCode == KeyEvent.KEYCODE_F4)) {
|
| return true;
|
| }
|
|
|
| @@ -193,18 +192,18 @@ public class ContentViewClient {
|
| * for instance, AKEYCODE_MEDIA_* will be dispatched to webkit*.
|
| */
|
| public static boolean shouldPropagateKey(int keyCode) {
|
| - if (keyCode == KeyEvent.KEYCODE_MENU ||
|
| - keyCode == KeyEvent.KEYCODE_HOME ||
|
| - keyCode == KeyEvent.KEYCODE_BACK ||
|
| - keyCode == KeyEvent.KEYCODE_CALL ||
|
| - keyCode == KeyEvent.KEYCODE_ENDCALL ||
|
| - keyCode == KeyEvent.KEYCODE_POWER ||
|
| - keyCode == KeyEvent.KEYCODE_HEADSETHOOK ||
|
| - keyCode == KeyEvent.KEYCODE_CAMERA ||
|
| - keyCode == KeyEvent.KEYCODE_FOCUS ||
|
| - keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
|
| - keyCode == KeyEvent.KEYCODE_VOLUME_MUTE ||
|
| - keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
|
| + if (keyCode == KeyEvent.KEYCODE_MENU
|
| + || keyCode == KeyEvent.KEYCODE_HOME
|
| + || keyCode == KeyEvent.KEYCODE_BACK
|
| + || keyCode == KeyEvent.KEYCODE_CALL
|
| + || keyCode == KeyEvent.KEYCODE_ENDCALL
|
| + || keyCode == KeyEvent.KEYCODE_POWER
|
| + || keyCode == KeyEvent.KEYCODE_HEADSETHOOK
|
| + || keyCode == KeyEvent.KEYCODE_CAMERA
|
| + || keyCode == KeyEvent.KEYCODE_FOCUS
|
| + || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
|
| + || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE
|
| + || keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
|
| return false;
|
| }
|
| return true;
|
|
|