diff options
| author | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 10:05:17 +0000 |
|---|---|---|
| committer | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 10:05:17 +0000 |
| commit | 42db8ec110f31892a87c47371c4095a790d4f245 (patch) | |
| tree | 9874168210292642890f5bfd67451e7231105b14 /chromeos | |
| parent | c6a95dbaafa03d107b607c358c8327f4b11b0f65 (diff) | |
| download | chromium_src-42db8ec110f31892a87c47371c4095a790d4f245.zip chromium_src-42db8ec110f31892a87c47371c4095a790d4f245.tar.gz chromium_src-42db8ec110f31892a87c47371c4095a790d4f245.tar.bz2 | |
Revert of Rollback option put behind the flag. (https://codereview.chromium.org/267393011/)
Reason for revert:
This seems to have broken ResetFirstAfterBootTest.SuccessOnRollbackRequested on http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%282%29/builds/23801.
Original issue's description:
> Rollback option put behind the flag.
>
> BUG=368860
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269753
TBR=nkostylev@chromium.org,merkulova@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=368860
Review URL: https://codereview.chromium.org/279203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 77cf81b..6478063 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -90,9 +90,6 @@ const char kEnableTouchpadThreeFingerClick[] // than the kiosk app mode. const char kEnableKioskMode[] = "enable-kiosk-mode"; -// Enables rollback option for resetting ChromeOS. -const char kEnableRollbackOption[] = "enable-rollback-option"; - // Enables request of tablet site (via user agent override). const char kEnableRequestTabletSite[] = "enable-request-tablet-site"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 0290c2b..01ab36b 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -40,7 +40,6 @@ CHROMEOS_EXPORT extern const char kEchoExtensionPath[]; CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[]; CHROMEOS_EXPORT extern const char kEnableConsumerManagement[]; CHROMEOS_EXPORT extern const char kEnableFileManagerMTP[]; -CHROMEOS_EXPORT extern const char kEnableRollbackOption[]; CHROMEOS_EXPORT extern const char kEnableHIDDetectionOnOOBE[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[]; |