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

Unified Diff: chrome/browser/policy/device_token_fetcher.cc

Issue 9814011: Rename enterprise policy proto fields from KIOSK to RETAIL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compilation and addressed comments. Created 8 years, 9 months 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
« no previous file with comments | « no previous file | chrome/browser/policy/device_token_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/device_token_fetcher.cc
diff --git a/chrome/browser/policy/device_token_fetcher.cc b/chrome/browser/policy/device_token_fetcher.cc
index 22ca50defa1331409dea9599e757cdb29d388a27..64eb20449dabd91ddc1232b67b2b30afef0403fe 100644
--- a/chrome/browser/policy/device_token_fetcher.cc
+++ b/chrome/browser/policy/device_token_fetcher.cc
@@ -80,7 +80,7 @@ DeviceMode TranslateProtobufDeviceMode(
switch (mode) {
case em::DeviceRegisterResponse::ENTERPRISE:
return DEVICE_MODE_ENTERPRISE;
- case em::DeviceRegisterResponse::KIOSK:
+ case em::DeviceRegisterResponse::RETAIL:
return DEVICE_MODE_KIOSK;
}
LOG(ERROR) << "Unknown enrollment mode in registration response: " << mode;
@@ -177,7 +177,7 @@ void DeviceTokenFetcher::FetchTokenInternal() {
if (!data_store_->machine_model().empty())
request->set_machine_model(data_store_->machine_model());
if (data_store_->known_machine_id())
- request->set_known_machine_id(true);
+ request->set_auto_enrolled(true);
request_job_->Start(base::Bind(&DeviceTokenFetcher::OnTokenFetchCompleted,
base::Unretained(this)));
UMA_HISTOGRAM_ENUMERATION(kMetricToken, kMetricTokenFetchRequested,
« no previous file with comments | « no previous file | chrome/browser/policy/device_token_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698