Chromium Code Reviews| Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
| 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 |
| index 0fa6353a0cd0799cd951ea60175a8e04f21012ec..fd56180007b1976e7f8e113ee302a62cde0278ff 100644 |
| --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
| +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
| @@ -16,7 +16,6 @@ import android.os.Build; |
| import android.os.Handler; |
| import android.os.Message; |
| import android.util.Log; |
| -import android.view.ActionMode; |
| import android.view.KeyEvent; |
| import android.view.View; |
| import android.webkit.ClientCertRequest; |
| @@ -51,9 +50,6 @@ import org.chromium.base.TraceEvent; |
| import org.chromium.content.browser.ContentView; |
| import org.chromium.content.browser.ContentViewClient; |
| import org.chromium.content.browser.ContentViewCore; |
| -import org.chromium.content.browser.WebActionMode; |
| -import org.chromium.content.browser.WebActionModeCallback; |
| -import org.chromium.content.browser.WebActionModeCallback.ActionHandler; |
| import java.lang.ref.WeakReference; |
| import java.security.Principal; |
| @@ -383,32 +379,6 @@ public class WebViewContentsClientAdapter extends AwContentsClient { |
| } |
| } |
| - /** |
| - * @See AwContentsClient#startActionMode(View,ActionHandler,boolean) |
| - */ |
| - @Override |
| - public WebActionMode startActionMode( |
| - View view, ActionHandler actionHandler, boolean floating) { |
| - try { |
| - TraceEvent.begin("WebViewContentsClientAdapter.startActionMode"); |
| - if (TRACE) Log.d(TAG, "startActionMode"); |
| - if (floating) return null; |
| - ActionMode.Callback callback = new WebActionModeCallback(mContext, actionHandler); |
| - ActionMode actionMode = view.startActionMode(callback); |
| - return actionMode != null ? new WebActionMode(actionMode) : null; |
| - } finally { |
| - TraceEvent.end("WebViewContentsClientAdapter.startActionMode"); |
| - } |
| - } |
| - |
| - /** |
| - * @See AwContentsClient#supportsFloatingActionMode() |
| - */ |
| - @Override |
| - public boolean supportsFloatingActionMode() { |
| - return false; |
| - } |
|
sgurun-gerrit only
2015/08/20 23:15:40
These changes should be merged to internal glue la
|
| - |
| @Override |
| public void onLoadResource(String url) { |
| try { |