| Index: chromeos/chromeos_switches.cc
 | 
| diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
 | 
| index 1ac2d21206aa9e598f98cb1c5a6ae2d879c0715d..7922826e02ae0c3302ccdb880f89c92b1a8f8fc3 100644
 | 
| --- a/chromeos/chromeos_switches.cc
 | 
| +++ b/chromeos/chromeos_switches.cc
 | 
| @@ -10,12 +10,40 @@ namespace switches {
 | 
|  // Path for app's OEM manifest file.
 | 
|  const char kAppOemManifestFile[]            = "app-mode-oem-manifest";
 | 
|  
 | 
| +// When wallpaper boot animation is not disabled this switch
 | 
| +// is used to override OOBE/sign in WebUI init type.
 | 
| +// Possible values: parallel|postpone. Default: parallel.
 | 
| +const char kAshWebUIInit[]                  = "ash-webui-init";
 | 
| +
 | 
| +// Enables overriding the path for the default authentication extension.
 | 
| +const char kAuthExtensionPath[]             = "auth-ext-path";
 | 
| +
 | 
|  // Enables overriding the Chrome OS board type when running on Linux.
 | 
|  const char kChromeOSReleaseBoard[] = "chromeos-release-board";
 | 
|  
 | 
|  // Forces the stub implementation of dbus clients.
 | 
|  const char kDbusStub[] = "dbus-stub";
 | 
|  
 | 
| +// Disables Kiosk app mode for ChromeOS.
 | 
| +const char kDisableAppMode[]                = "disable-app-mode";
 | 
| +
 | 
| +// Disables wallpaper boot animation (except of OOBE case).
 | 
| +const char kDisableBootAnimation[]          = "disable-boot-animation";
 | 
| +
 | 
| +// Disables Chrome Captive Portal detector, which initiates Captive
 | 
| +// Portal detection for new active networks.
 | 
| +const char kDisableChromeCaptivePortalDetector[] =
 | 
| +    "disable-chrome-captive-portal-detector";
 | 
| +
 | 
| +// Disables Google Drive integration.
 | 
| +const char kDisableDrive[]                  = "disable-drive";
 | 
| +
 | 
| +// Disable policy-configured local accounts.
 | 
| +const char kDisableLocalAccounts[]          = "disable-local-accounts";
 | 
| +
 | 
| +// Avoid doing expensive animations upon login.
 | 
| +const char kDisableLoginAnimations[]        = "disable-login-animations";
 | 
| +
 | 
|  // Disable Quickoffice component app thus handlers won't be registered so
 | 
|  // it will be possible to install another version as normal app for testing.
 | 
|  const char kDisableQuickofficeComponentApp[] =
 | 
| @@ -24,6 +52,9 @@ const char kDisableQuickofficeComponentApp[] =
 | 
|  // Disables fetching online CrOS EULA page, only static version is shown.
 | 
|  const char kDisableOnlineEULA[] = "disable-cros-online-eula";
 | 
|  
 | 
| +// Avoid doing animations upon oobe.
 | 
| +const char kDisableOobeAnimation[]          = "disable-oobe-animation";
 | 
| +
 | 
|  // Disables portal detection and network error handling before auto
 | 
|  // update.
 | 
|  const char kDisableOOBEBlockingUpdate[] =
 | 
| @@ -32,9 +63,25 @@ const char kDisableOOBEBlockingUpdate[] =
 | 
|  // Disables fake ethernet network in the stub implementations.
 | 
|  const char kDisableStubEthernet[] = "disable-stub-ethernet";
 | 
|  
 | 
| +// Enables overriding the path for the default echo component extension.
 | 
| +// Useful for testing.
 | 
| +const char kEchoExtensionPath[]             = "echo-ext-path";
 | 
| +
 | 
| +// Enables component extension that initializes background pages of
 | 
| +// certain hosted applications.
 | 
| +const char kEnableBackgroundLoader[]        = "enable-background-loader";
 | 
| +
 | 
| +// Enables switching between different cellular carriers from the UI.
 | 
| +const char kEnableCarrierSwitching[]        = "enable-carrier-switching";
 | 
| +
 | 
|  // Enable switching between audio devices in Chrome instead of cras.
 | 
|  const char kEnableChromeAudioSwitching[] = "enable-chrome-audio-switching";
 | 
|  
 | 
| +// Enables Chrome Captive Portal detector, which initiates Captive
 | 
| +// Portal detection for new active networks.
 | 
| +const char kEnableChromeCaptivePortalDetector[] =
 | 
| +    "enable-chrome-captive-portal-detector";
 | 
| +
 | 
|  // Enable experimental Bluetooth features.
 | 
|  const char kEnableExperimentalBluetooth[] = "enable-experimental-bluetooth";
 | 
|  
 | 
| @@ -48,6 +95,41 @@ const char kEnableScreensaverExtensions[] = "enable-screensaver-extensions";
 | 
|  // Enable "interactive" mode for stub implemenations (e.g. NetworkStateHandler)
 | 
|  const char kEnableStubInteractive[] = "enable-stub-interactive";
 | 
|  
 | 
| +// Enables touchpad three-finger-click as middle button.
 | 
| +const char kEnableTouchpadThreeFingerClick[]
 | 
| +    = "enable-touchpad-three-finger-click";
 | 
| +
 | 
| +// Enables touchpad three-finger swipe.
 | 
| +const char kEnableTouchpadThreeFingerSwipe[]
 | 
| +    = "enable-touchpad-three-finger-swipe";
 | 
| +
 | 
| +// Enable Kiosk mode for ChromeOS.
 | 
| +const char kEnableKioskMode[]               = "enable-kiosk-mode";
 | 
| +
 | 
| +// Enables request of tablet site (via user agent override).
 | 
| +const char kEnableRequestTabletSite[]       = "enable-request-tablet-site";
 | 
| +
 | 
| +// Enables static ip configuration. This flag should be removed when it's on by
 | 
| +// default.
 | 
| +const char kEnableStaticIPConfig[]          = "enable-static-ip-config";
 | 
| +
 | 
| +// Power of the power-of-2 initial modulus that will be used by the
 | 
| +// auto-enrollment client. E.g. "4" means the modulus will be 2^4 = 16.
 | 
| +const char kEnterpriseEnrollmentInitialModulus[] =
 | 
| +    "enterprise-enrollment-initial-modulus";
 | 
| +
 | 
| +// Power of the power-of-2 maximum modulus that will be used by the
 | 
| +// auto-enrollment client.
 | 
| +const char kEnterpriseEnrollmentModulusLimit[] =
 | 
| +    "enterprise-enrollment-modulus-limit";
 | 
| +
 | 
| +// Loads the File Manager as an extension instead of a platform app.
 | 
| +// This flag is obsolete. Remove it, once Files.app v2 is stable.
 | 
| +const char kFileManagerLegacy[]             = "file-manager-legacy";
 | 
| +
 | 
| +// Loads the File Manager with the legacy UI.
 | 
| +const char kFileManagerLegacyUI[]           = "file-manager-legacy-ui";
 | 
| +
 | 
|  // Passed to Chrome on first boot. Not passed on restart after sign out.
 | 
|  const char kFirstBoot[]                     = "first-boot";
 | 
|  
 | 
| @@ -59,6 +141,16 @@ const char kForceLoginManagerInTests[]      = "force-login-manager-in-tests";
 | 
|  // mode. Should completely disable extensions, sync and bookmarks.
 | 
|  const char kGuestSession[]                  = "bwsi";
 | 
|  
 | 
| +// If true, the Chromebook has a Chrome OS keyboard. Don't use the flag for
 | 
| +// Chromeboxes.
 | 
| +const char kHasChromeOSKeyboard[]           = "has-chromeos-keyboard";
 | 
| +
 | 
| +// If true, the Chromebook has a keyboard with a diamond key.
 | 
| +const char kHasChromeOSDiamondKey[]         = "has-chromeos-diamond-key";
 | 
| +
 | 
| +// Path for the screensaver used in Kiosk mode
 | 
| +const char kKioskModeScreensaverPath[]      = "kiosk-mode-screensaver-path";
 | 
| +
 | 
|  // Enables Chrome-as-a-login-manager behavior.
 | 
|  const char kLoginManager[]                  = "login-manager";
 | 
|  
 | 
| @@ -81,9 +173,27 @@ const char kLoginScreenSize[]               = "login-screen-size";
 | 
|  // Specifies the user which is already logged in.
 | 
|  const char kLoginUser[]                     = "login-user";
 | 
|  
 | 
| +// Enables natural scroll by default.
 | 
| +const char kNaturalScrollDefault[]          = "enable-natural-scroll-default";
 | 
| +
 | 
| +// Disables tab discard in low memory conditions, a feature which silently
 | 
| +// closes inactive tabs to free memory and to attempt to avoid the kernel's
 | 
| +// out-of-memory process killer.
 | 
| +const char kNoDiscardTabs[]                 = "no-discard-tabs";
 | 
| +
 | 
| +#ifndef NDEBUG
 | 
| +// Skips all other OOBE pages after user login.
 | 
| +const char kOobeSkipPostLogin[]             = "oobe-skip-postlogin";
 | 
| +#endif  // NDEBUG
 | 
| +
 | 
|  // Sends test messages on first call to RequestUpdate (stub only).
 | 
|  const char kSmsTestMessages[] = "sms-test-messages";
 | 
|  
 | 
| +// Indicates that a stub implementation of CrosSettings that stores settings in
 | 
| +// memory without signing should be used, treating current user as the owner.
 | 
| +// This option is for testing the chromeos build of chrome on the desktop only.
 | 
| +const char kStubCrosSettings[]              = "stub-cros-settings";
 | 
| +
 | 
|  // Enables usage of the new ManagedNetworkConfigurationHandler and
 | 
|  // NetworkConfigurationHandler singletons.
 | 
|  const char kUseNewNetworkConfigurationHandlers[] =
 | 
| 
 |