OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 org.chromium.blimp.core; | 5 package org.chromium.blimp.core; |
6 | 6 |
7 import android.preference.PreferenceFragment; | 7 import android.preference.PreferenceFragment; |
8 | 8 |
9 import org.chromium.base.annotations.CalledByNative; | 9 import org.chromium.base.annotations.CalledByNative; |
10 import org.chromium.base.annotations.JNINamespace; | 10 import org.chromium.base.annotations.JNINamespace; |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 assert mNativeBlimpClientContextImplAndroid != 0; | 60 assert mNativeBlimpClientContextImplAndroid != 0; |
61 return nativeCreateBlimpContentsJava(mNativeBlimpClientContextImplAndroi
d); | 61 return nativeCreateBlimpContentsJava(mNativeBlimpClientContextImplAndroi
d); |
62 } | 62 } |
63 | 63 |
64 @Override | 64 @Override |
65 public boolean isBlimpSupported() { | 65 public boolean isBlimpSupported() { |
66 return true; | 66 return true; |
67 } | 67 } |
68 | 68 |
69 @Override | 69 @Override |
70 public void attachBlimpPreferences(PreferenceFragment fragment, | 70 public boolean isBlimpEnabled() { |
71 BlimpSettingsCallbacks callbacks) { | 71 return false; |
| 72 } |
| 73 |
| 74 @Override |
| 75 public void attachBlimpPreferences( |
| 76 PreferenceFragment fragment, BlimpSettingsCallbacks callbacks) { |
72 AboutBlimpPreferences.addBlimpPreferences(fragment); | 77 AboutBlimpPreferences.addBlimpPreferences(fragment); |
73 AboutBlimpPreferences.registerCallback(callbacks); | 78 AboutBlimpPreferences.registerCallback(callbacks); |
74 } | 79 } |
75 | 80 |
76 @Override | 81 @Override |
77 public void connect() { | 82 public void connect() { |
78 assert mNativeBlimpClientContextImplAndroid != 0; | 83 assert mNativeBlimpClientContextImplAndroid != 0; |
79 nativeConnectFromJava(mNativeBlimpClientContextImplAndroid); | 84 nativeConnectFromJava(mNativeBlimpClientContextImplAndroid); |
80 } | 85 } |
81 | 86 |
(...skipping 11 matching lines...) Expand all Loading... |
93 @CalledByNative | 98 @CalledByNative |
94 private String getAssignerUrl() { | 99 private String getAssignerUrl() { |
95 return PreferencesUtil.getLastUsedAssigner(); | 100 return PreferencesUtil.getLastUsedAssigner(); |
96 } | 101 } |
97 | 102 |
98 private native BlimpContents nativeCreateBlimpContentsJava( | 103 private native BlimpContents nativeCreateBlimpContentsJava( |
99 long nativeBlimpClientContextImplAndroid); | 104 long nativeBlimpClientContextImplAndroid); |
100 | 105 |
101 private native void nativeConnectFromJava(long nativeBlimpClientContextImplA
ndroid); | 106 private native void nativeConnectFromJava(long nativeBlimpClientContextImplA
ndroid); |
102 } | 107 } |
OLD | NEW |