Merge ApplicationSwitches.java and ChromeSwitches.java

chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java

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 9dfbe2ce56b28afc460b5ebfa07f81fb0f9af8a4..91f01e159dfdea3a20921845c616dd6bfd0962e8 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 {
     // (per tab stack)?  These take very low memory but have poor quality.
     public static final String APPROXIMATION_THUMBNAILS = "approximation-thumbnails";
 
+    /**
+     * Disable bottom infobar-like Reader Mode panel.
+     */
+    public static final String DISABLE_READER_MODE_BOTTOM_BAR = "disable-reader-mode-bottom-bar";

[newt (away), 2015/05/26 14:14:04]

nit: I'd put DISABLE_READER_MODE_BOTTOM_BAR and ENABLE_READER_MODE_BOTTOM_BAR
next to each other. Having them adjacent is more useful IMO than placing them
correctly relative to the "native switches" comment.

+
     ///////////////////////////////////////////////////////////////////////////////////////////////
     // Native Switches
     ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -142,6 +147,24 @@ public abstract class ChromeSwitches {
     public static final String USE_FAKE_DEVICE_FOR_MEDIA_STREAM =
             "use-fake-device-for-media-stream";
 
+    /**
+     * Disables the new icon-centric NTP design.
+     * Native switch - switches::kDisableIconNtp
+     */
+    public static final String DISABLE_ICON_NTP = "disable-icon-ntp";
+
+    /**
+     * Enables the new icon-centric NTP design.
+     * Native switch - switches::kEnableIconNtp
+     */
+    public static final String ENABLE_ICON_NTP = "enable-icon-ntp";
+
+    /**
+     * Enable Reader Mode button.
+     * Native switch - switches::kEnableReaderModeToolbarIcon
+     */
+    public static final String ENABLE_READER_MODE_BUTTON = "enable-reader-mode-toolbar-icon";
+
     // Prevent instantiation.
     private ChromeSwitches() {}
 }