| Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
|
| index 3d2b55d84bc567bb854f42ff1fa96252748f5d1a..6520d416beeea6783680a7d6fc1961d318b87671 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
|
| @@ -93,6 +93,11 @@ public abstract class ChromeSwitches {
|
| */
|
| public static final String MARKET_URL_FOR_TESTING = "market-url-for-testing";
|
|
|
| + /**
|
| + * Disable multiwindow tab merging for testing.
|
| + */
|
| + public static final String DISABLE_TAB_MERGING_FOR_TESTING = "disable-tab-merging";
|
| +
|
| ///////////////////////////////////////////////////////////////////////////////////////////////
|
| // Native Switches
|
| ///////////////////////////////////////////////////////////////////////////////////////////////
|
|
|