| Index: blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| diff --git a/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java b/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| deleted file mode 100644
|
| index 79998bee439f8455d0b3861615e0577034cdd8c7..0000000000000000000000000000000000000000
|
| --- a/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| +++ /dev/null
|
| @@ -1,140 +0,0 @@
|
| -// Copyright 2016 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -package org.chromium.blimp.core;
|
| -
|
| -import android.preference.PreferenceFragment;
|
| -
|
| -import org.chromium.base.CommandLine;
|
| -import org.chromium.base.annotations.CalledByNative;
|
| -import org.chromium.base.annotations.JNINamespace;
|
| -import org.chromium.blimp.core.common.PreferencesUtil;
|
| -import org.chromium.blimp.core.feedback.BlimpFeedbackData;
|
| -import org.chromium.blimp.core.settings.AboutBlimpPreferences;
|
| -import org.chromium.blimp.core.settings.BlimpPreferencesDelegate;
|
| -import org.chromium.blimp.core.settings.Settings;
|
| -import org.chromium.blimp_public.BlimpClientContext;
|
| -import org.chromium.blimp_public.BlimpClientContextDelegate;
|
| -import org.chromium.blimp_public.contents.BlimpContents;
|
| -import org.chromium.ui.base.WindowAndroid;
|
| -
|
| -import java.util.HashMap;
|
| -import java.util.Map;
|
| -
|
| -/**
|
| - * BlimpClientContextImpl is a Java wrapper to allow communicating with the native
|
| - * BlimpClientContextImpl object.
|
| - */
|
| -@JNINamespace("blimp::client")
|
| -public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferencesDelegate {
|
| - // Delegate that contains functions Blimp needed in the embedder.
|
| - private BlimpClientContextDelegate mDelegate;
|
| -
|
| - /**
|
| - * Get embedder delegate which provides necessary functionality and callbacks.
|
| - *
|
| - * The delegate is created through JNI in early startup.
|
| - *
|
| - * @return BlimpClientContextDelegate, which contains functions we need in embedder.
|
| - */
|
| - @Override
|
| - public BlimpClientContextDelegate getDelegate() {
|
| - return mDelegate;
|
| - }
|
| -
|
| - @Override
|
| - public void initSettingsPage(AboutBlimpPreferences preferences) {
|
| - nativeInitSettingsPage(mNativeBlimpClientContextImplAndroid, preferences);
|
| - }
|
| -
|
| - @CalledByNative
|
| - private static BlimpClientContextImpl create(long nativeBlimpClientContextImplAndroid) {
|
| - return new BlimpClientContextImpl(nativeBlimpClientContextImplAndroid);
|
| - }
|
| -
|
| - /**
|
| - * The pointer to the BlimpClientContextImplAndroid JNI bridge.
|
| - */
|
| - private long mNativeBlimpClientContextImplAndroid;
|
| -
|
| - private BlimpClientContextImpl(long nativeBlimpClientContextImplAndroid) {
|
| - mNativeBlimpClientContextImplAndroid = nativeBlimpClientContextImplAndroid;
|
| - }
|
| -
|
| - /**
|
| - * Get Settings java object, whose lifetime is the same as BlimpClientContextImpl's.
|
| - */
|
| - public Settings getSettings() {
|
| - assert mNativeBlimpClientContextImplAndroid != 0;
|
| - return nativeGetSettings(mNativeBlimpClientContextImplAndroid);
|
| - }
|
| -
|
| - @Override
|
| - public BlimpContents createBlimpContents(WindowAndroid windowAndroid) {
|
| - assert mNativeBlimpClientContextImplAndroid != 0;
|
| - return nativeCreateBlimpContentsJava(
|
| - mNativeBlimpClientContextImplAndroid, windowAndroid.getNativePointer());
|
| - }
|
| -
|
| - @Override
|
| - public boolean isBlimpSupported() {
|
| - return true;
|
| - }
|
| -
|
| - @Override
|
| - public boolean isBlimpEnabled() {
|
| - return PreferencesUtil.isBlimpEnabled()
|
| - || CommandLine.getInstance().hasSwitch(BlimpClientSwitches.ENABLE_BLIMP);
|
| - }
|
| -
|
| - @Override
|
| - public void attachBlimpPreferences(PreferenceFragment fragment) {
|
| - AboutBlimpPreferences.addBlimpPreferences(fragment, this);
|
| - }
|
| -
|
| - @Override
|
| - public void setDelegate(BlimpClientContextDelegate delegate) {
|
| - mDelegate = delegate;
|
| - }
|
| -
|
| - @Override
|
| - public void connect() {
|
| - assert mNativeBlimpClientContextImplAndroid != 0;
|
| - nativeConnectFromJava(mNativeBlimpClientContextImplAndroid);
|
| - }
|
| -
|
| - @Override
|
| - public Map<String, String> getFeedbackMap() {
|
| - if (mNativeBlimpClientContextImplAndroid == 0 || !isBlimpEnabled()) return new HashMap<>();
|
| -
|
| - return nativeCreateBlimpFeedbackDataJava(mNativeBlimpClientContextImplAndroid).asMap();
|
| - }
|
| -
|
| - @CalledByNative
|
| - private void clearNativePtr() {
|
| - mNativeBlimpClientContextImplAndroid = 0;
|
| - }
|
| -
|
| - @CalledByNative
|
| - private long getNativePtr() {
|
| - assert mNativeBlimpClientContextImplAndroid != 0;
|
| - return mNativeBlimpClientContextImplAndroid;
|
| - }
|
| -
|
| - @CalledByNative
|
| - private String getAssignerUrl() {
|
| - return PreferencesUtil.getLastUsedAssigner();
|
| - }
|
| -
|
| - private native BlimpContents nativeCreateBlimpContentsJava(
|
| - long nativeBlimpClientContextImplAndroid, long windowAndroidPtr);
|
| -
|
| - private native BlimpFeedbackData nativeCreateBlimpFeedbackDataJava(
|
| - long nativeBlimpClientContextImplAndroid);
|
| -
|
| - private native void nativeConnectFromJava(long nativeBlimpClientContextImplAndroid);
|
| - private native void nativeInitSettingsPage(
|
| - long nativeBlimpClientContextImplAndroid, AboutBlimpPreferences preferences);
|
| - private native Settings nativeGetSettings(long nativeBlimpClientContextImplAndroid);
|
| -}
|
|
|