Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2017)

Unified Diff: chrome/browser/chromeos/policy/enterprise_install_attributes.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/enterprise_install_attributes.cc
diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
index 98ee128bd6e8506ee7515a098c2732eb54606155..9b58583de7bb200a9cdd8ed3b7f250f34713b672 100644
--- a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
+++ b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
@@ -304,7 +304,7 @@ DeviceMode EnterpriseInstallAttributes::GetMode() {
// that all changes to the constants are reflected there as well.
const char EnterpriseInstallAttributes::kConsumerDeviceMode[] = "consumer";
const char EnterpriseInstallAttributes::kEnterpriseDeviceMode[] = "enterprise";
-const char EnterpriseInstallAttributes::kRetailKioskDeviceMode[] = "kiosk";
+const char EnterpriseInstallAttributes::kLegacyRetailDeviceMode[] = "kiosk";
const char EnterpriseInstallAttributes::kConsumerKioskDeviceMode[] =
"consumer_kiosk";
const char EnterpriseInstallAttributes::kUnknownDeviceMode[] = "unknown";
@@ -328,8 +328,8 @@ std::string EnterpriseInstallAttributes::GetDeviceModeString(DeviceMode mode) {
return EnterpriseInstallAttributes::kConsumerDeviceMode;
case DEVICE_MODE_ENTERPRISE:
return EnterpriseInstallAttributes::kEnterpriseDeviceMode;
- case DEVICE_MODE_RETAIL_KIOSK:
- return EnterpriseInstallAttributes::kRetailKioskDeviceMode;
+ case DEVICE_MODE_LEGACY_RETAIL_MODE:
+ return EnterpriseInstallAttributes::kLegacyRetailDeviceMode;
case DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH:
return EnterpriseInstallAttributes::kConsumerKioskDeviceMode;
case DEVICE_MODE_PENDING:
@@ -346,8 +346,8 @@ DeviceMode EnterpriseInstallAttributes::GetDeviceModeFromString(
return DEVICE_MODE_CONSUMER;
else if (mode == EnterpriseInstallAttributes::kEnterpriseDeviceMode)
return DEVICE_MODE_ENTERPRISE;
- else if (mode == EnterpriseInstallAttributes::kRetailKioskDeviceMode)
- return DEVICE_MODE_RETAIL_KIOSK;
+ else if (mode == EnterpriseInstallAttributes::kLegacyRetailDeviceMode)
+ return DEVICE_MODE_LEGACY_RETAIL_MODE;
else if (mode == EnterpriseInstallAttributes::kConsumerKioskDeviceMode)
return DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH;
NOTREACHED() << "Unknown device mode string: " << mode;

Powered by Google App Engine
This is Rietveld 408576698