Merge ApplicationSwitches.java and ChromeSwitches.java

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 /**
  * Contains all of the command line switches that are specific to the chrome/
  * portion of Chromium on Android.
  */
@@ skipping 75 matching lines @@
     @Deprecated
     public static final String ENABLE_EMBEDDED_MODE = "enable-hosted-mode";
 
     // How many thumbnails should we allow in the cache (per tab stack)?
     public static final String THUMBNAILS = "thumbnails";
 
     // How many "approximated" thumbnails should we allow in the cache
     // (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
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
      * Sets the max number of render processes to use.
      * Native switch - content_switches::kRendererProcessLimit.
      */
     public static final String RENDER_PROCESS_LIMIT = "renderer-process-limit";
 
@@ skipping 29 matching lines @@
      */
     public static final String GOOGLE_BASE_URL = "google-base-url";
 
     /**
      * Use fake device for Media Stream to replace actual camera and microphone.
      * Native switch - switches::kUseFakeDeviceForMediaStream.
      */
     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() {}
 }