Merge 176800

chrome/common/chrome_switches.h

 // Copyright (c) 2012 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.
 
 // Defines all the command-line switches used by Chrome.
 
 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_
 #define CHROME_COMMON_CHROME_SWITCHES_H_
 
 #include "build/build_config.h"
@@ skipping 380 matching lines @@
 extern const char kDisableNewOobe[];
 extern const char kDisableNewPasswordChangedDialog[];
 extern const char kDisableOobeAnimation[];
 extern const char kDisableStubEthernet[];
 extern const char kEnableBackgroundLoader[];
 extern const char kEnableCarrierSwitching[];
 extern const char kEnableChromeCaptivePortalDetector[];
 extern const char kEnableDriveMetadataPrefetch[];
 extern const char kEnableTouchpadThreeFingerClick[];
 extern const char kEnableTouchpadThreeFingerSwipe[];
-extern const char kSkipOAuthLogin[];
 extern const char kEnableKioskMode[];
 extern const char kDisableLocalAccounts[];
 extern const char kEnableRequestTabletSite[];
 extern const char kEnableStaticIPConfig[];
 extern const char kFirstBoot[];
+extern const char kForceOAuth1[];
 extern const char kHasChromeOSKeyboard[];
 extern const char kHasChromeOSDiamondKey[];
 extern const char kKioskModeScreensaverPath[];
 extern const char kLoginManager[];
 // TODO(avayvod): Remove this flag when it's unnecessary for testing
 // purposes.
 extern const char kLoginScreen[];
 extern const char kLoginScreenSize[];
 extern const char kLoginProfile[];
 extern const char kLoginUser[];
@@ skipping 46 matching lines @@
 #else
 extern const char kEnablePrintPreview[];
 #endif
 
 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
 // alphabetical order, or in one of the ifdefs (also in order in each section).
 
 }  // namespace switches
 
 #endif  // CHROME_COMMON_CHROME_SWITCHES_H_