| Index: chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
|
| diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
|
| index 12ed7eea9b5a9129e299ac3122e685f50439e902..1a64f3a5289a3b8529c43c9a4b3662cb650ba650 100644
|
| --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
|
| +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
|
| @@ -8,6 +8,8 @@ import android.app.Service;
|
| import android.content.Intent;
|
| import android.os.IBinder;
|
|
|
| +import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
|
| +
|
| /**
|
| * Custom tabs connection service, used by the embedded Chrome activities.
|
| */
|
| @@ -19,6 +21,8 @@ public class CustomTabsConnectionService extends Service {
|
|
|
| @Override
|
| public IBinder onBind(Intent intent) {
|
| + if (!ChromePreferenceManager.getInstance(this).getCustomTabsEnabled()) return null;
|
| +
|
| return (IBinder) CustomTabsConnection.getInstance(getApplication());
|
| }
|
|
|
|
|