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

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

Issue 1492043002: Introduced switches for Master/Slave bootstrapping process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the unused shark requisition. Created 5 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/device_cloud_policy_manager_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
index 8f24001488e08da2914a9fb14222bcfc0bf5c2ee..c6e77cbcbdaa4eaef943f5fdea901d17bd2d64c7 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -48,7 +48,6 @@ namespace {
const char kNoRequisition[] = "none";
const char kRemoraRequisition[] = "remora";
-const char kSharkRequisition[] = "shark";
// These are the machine serial number keys that we check in order until we
// find a non-empty serial number. The VPD spec says the serial number should be
@@ -181,10 +180,6 @@ bool DeviceCloudPolicyManagerChromeOS::IsRemoraRequisition() const {
return GetDeviceRequisition() == kRemoraRequisition;
}
-bool DeviceCloudPolicyManagerChromeOS::IsSharkRequisition() const {
- return GetDeviceRequisition() == kSharkRequisition;
-}
-
void DeviceCloudPolicyManagerChromeOS::Shutdown() {
status_uploader_.reset();
syslog_uploader_.reset();
@@ -306,8 +301,7 @@ void DeviceCloudPolicyManagerChromeOS::InitializeRequisition() {
if (!requisition.empty()) {
local_state_->SetString(prefs::kDeviceEnrollmentRequisition,
requisition);
- if (requisition == kRemoraRequisition ||
- requisition == kSharkRequisition) {
+ if (requisition == kRemoraRequisition) {
local_state_->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
} else {

Powered by Google App Engine
This is Rietveld 408576698