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

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

Issue 6821045: Connect enrollment screen to cloud policy subsystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tests... Created 9 years, 8 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
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 c1739a8ab490c6a52c217554fde61e78c3537739..0e4cc72a25cfd80db899f228cec8f1b2361e0822 100644
--- a/chrome/browser/policy/device_token_fetcher.cc
+++ b/chrome/browser/policy/device_token_fetcher.cc
@@ -64,12 +64,14 @@ void DeviceTokenFetcher::FetchToken(
const std::string& auth_token,
const std::string& device_id,
em::DeviceRegisterRequest_Type policy_type,
- const std::string& machine_id) {
+ const std::string& machine_id,
+ const std::string& machine_model) {
SetState(STATE_INACTIVE);
auth_token_ = auth_token;
device_id_ = device_id;
policy_type_ = policy_type;
machine_id_ = machine_id;
+ machine_model_ = machine_model;
FetchTokenInternal();
}
@@ -86,7 +88,8 @@ void DeviceTokenFetcher::FetchTokenInternal() {
request.set_type(policy_type_);
if (!machine_id_.empty())
request.set_machine_id(machine_id_);
- request.set_machine_model(kRegisterRequestMachineModel);
+ if (!machine_model_.empty())
+ request.set_machine_model(machine_model_);
backend_->ProcessRegisterRequest(auth_token_, device_id_, request, this);
}
« no previous file with comments | « chrome/browser/policy/device_token_fetcher.h ('k') | chrome/browser/policy/device_token_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698