| Index: chrome/browser/policy/browser_policy_connector.cc
|
| diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
|
| index 080c5c9afd050be75f371e9207bf2e287d8e862a..fa92c1ae67cb41b76a351a04cfc08d1c84e9caf8 100644
|
| --- a/chrome/browser/policy/browser_policy_connector.cc
|
| +++ b/chrome/browser/policy/browser_policy_connector.cc
|
| @@ -186,15 +186,21 @@ PolicyService* BrowserPolicyConnector::CreatePolicyService(
|
| void BrowserPolicyConnector::RegisterForDevicePolicy(
|
| const std::string& owner_email,
|
| const std::string& token,
|
| - bool known_machine_id) {
|
| + bool known_machine_id,
|
| + bool reregister) {
|
| #if defined(OS_CHROMEOS)
|
| if (device_data_store_.get()) {
|
| if (!device_data_store_->device_token().empty()) {
|
| LOG(ERROR) << "Device policy data store already has a DMToken; "
|
| << "RegisterForDevicePolicy won't trigger a new registration.";
|
| }
|
| +
|
| device_data_store_->set_user_name(owner_email);
|
| device_data_store_->set_known_machine_id(known_machine_id);
|
| + if (reregister) {
|
| + device_data_store_->set_device_id(install_attributes_->GetDeviceId());
|
| + device_data_store_->set_reregister(true);
|
| + }
|
| device_data_store_->set_policy_fetching_enabled(false);
|
| device_data_store_->SetOAuthToken(token);
|
| }
|
|
|