Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Unified Diff: base/android/java/src/org/chromium/base/BaseChromiumApplication.java

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/cxa_demangle_stub.cc ('k') | base/android/java/src/org/chromium/base/BuildInfo.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/java/src/org/chromium/base/BaseChromiumApplication.java
diff --git a/base/android/java/src/org/chromium/base/BaseChromiumApplication.java b/base/android/java/src/org/chromium/base/BaseChromiumApplication.java
index d7c7b05ea58d88808aef44d10e798448e74ec0ca..8ec4afa6637fc90138ba1eec32f7dca47864198b 100644
--- a/base/android/java/src/org/chromium/base/BaseChromiumApplication.java
+++ b/base/android/java/src/org/chromium/base/BaseChromiumApplication.java
@@ -8,7 +8,6 @@ import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
-import android.view.KeyEvent;
import android.view.Window;
import java.lang.reflect.InvocationHandler;
@@ -38,9 +37,6 @@ public class BaseChromiumApplication extends Application {
/**
* Intercepts calls to an existing Window.Callback. Most invocations are passed on directly
* to the composed Window.Callback but enables intercepting/manipulating others.
- *
- * This is used to relay window focus changes throughout the app and remedy a bug in the
- * appcompat library.
*/
private class WindowCallbackProxy implements InvocationHandler {
private final Window.Callback mCallback;
@@ -57,9 +53,6 @@ public class BaseChromiumApplication extends Application {
&& args[0] instanceof Boolean) {
onWindowFocusChanged((boolean) args[0]);
return null;
- } else if (method.getName().equals("dispatchKeyEvent") && args.length == 1
- && args[0] instanceof KeyEvent) {
- return dispatchKeyEvent((KeyEvent) args[0]);
} else {
try {
return method.invoke(mCallback, args);
@@ -85,15 +78,6 @@ public class BaseChromiumApplication extends Application {
listener.onWindowFocusChanged(mActivity, hasFocus);
}
}
-
- public boolean dispatchKeyEvent(KeyEvent event) {
- // TODO(aurimas): remove this once AppCompatDelegateImpl no longer steals
- // KEYCODE_MENU. (see b/20529185)
- if (event.getKeyCode() == KeyEvent.KEYCODE_MENU && mActivity.dispatchKeyEvent(event)) {
- return true;
- }
- return mCallback.dispatchKeyEvent(event);
- }
}
@Override
public void onCreate() {
« no previous file with comments | « base/android/cxa_demangle_stub.cc ('k') | base/android/java/src/org/chromium/base/BuildInfo.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698