| Index: blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java
|
| diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java
|
| index 3fe561b884ac56a6ce00b10d28557b9f837ad04a..cff5df6d60f2b196f795504fa3f0ce3cb04cf6a5 100644
|
| --- a/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java
|
| +++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java
|
| @@ -10,7 +10,6 @@ import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.base.annotations.JNINamespace;
|
| import org.chromium.blimp_public.BlimpClientContext;
|
| import org.chromium.blimp_public.BlimpClientContextDelegate;
|
| -import org.chromium.blimp_public.BlimpSettingsCallbacks;
|
| import org.chromium.blimp_public.contents.BlimpContents;
|
|
|
| /**
|
| @@ -54,13 +53,15 @@ public class DummyBlimpClientContext implements BlimpClientContext {
|
| }
|
|
|
| @Override
|
| - public void attachBlimpPreferences(PreferenceFragment fragment,
|
| - BlimpSettingsCallbacks callbacks) {
|
| + public boolean isBlimpEnabled() {
|
| + return false;
|
| }
|
|
|
| @Override
|
| - public void setDelegate(BlimpClientContextDelegate delegate) {
|
| - }
|
| + public void attachBlimpPreferences(PreferenceFragment fragment) {}
|
| +
|
| + @Override
|
| + public void setDelegate(BlimpClientContextDelegate delegate) {}
|
|
|
| @Override
|
| public void connect() {}
|
|
|