Blimp settings UI integration for Chrome, everything still lives in Blimp.

blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

Index: blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
index ea547729d3a186625ea938ca98fb9758e0f1f845..55c9181218bda13aa879386f15f6a9d264327e7d 100644
--- a/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
+++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
@@ -4,9 +4,13 @@
 
 package org.chromium.blimp.core;
 
+import android.preference.PreferenceFragment;
+
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.blimp.core.settings.AboutBlimpPreferences;
 import org.chromium.blimp_public.BlimpClientContext;
+import org.chromium.blimp_public.BlimpSettingsCallbacks;
 import org.chromium.blimp_public.contents.BlimpContents;
 
 /**
@@ -35,6 +39,18 @@ public class BlimpClientContextImpl implements BlimpClientContext {
         return nativeCreateBlimpContents(mNativeBlimpClientContextImplAndroid);
     }
 
+    @Override
+    public boolean isBlimpSupported() {
+        return true;
+    }
+
+    @Override
+    public  void attachBlimpPreferences(PreferenceFragment fragment,

[David Trainor- moved to gerrit, 2016/07/22 16:51:42]

Remove extra space

[xingliu, 2016/07/23 23:50:36]

Done.

+            BlimpSettingsCallbacks callbacks) {
+        AboutBlimpPreferences.addBlimpPreferences(fragment);
+        AboutBlimpPreferences.registerCallback(callbacks);
+    }
+
     @CalledByNative
     private void clearNativePtr() {
         mNativeBlimpClientContextImplAndroid = 0;