OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 cryptohome::AsyncMethodCaller::GetInstance(), CreateAttestationFlow(), | 357 cryptohome::AsyncMethodCaller::GetInstance(), CreateAttestationFlow(), |
358 chromeos::system::StatisticsProvider::GetInstance()); | 358 chromeos::system::StatisticsProvider::GetInstance()); |
359 device_cloud_policy_initializer_->Init(); | 359 device_cloud_policy_initializer_->Init(); |
360 } | 360 } |
361 | 361 |
362 std::unique_ptr<chromeos::attestation::AttestationFlow> | 362 std::unique_ptr<chromeos::attestation::AttestationFlow> |
363 BrowserPolicyConnectorChromeOS::CreateAttestationFlow() { | 363 BrowserPolicyConnectorChromeOS::CreateAttestationFlow() { |
364 return base::MakeUnique<chromeos::attestation::AttestationFlow>( | 364 return base::MakeUnique<chromeos::attestation::AttestationFlow>( |
365 cryptohome::AsyncMethodCaller::GetInstance(), | 365 cryptohome::AsyncMethodCaller::GetInstance(), |
366 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(), | 366 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(), |
367 base::MakeUnique<chromeos::attestation::AttestationCAClient>()); | 367 base::MakeUnique<chromeos::attestation::AttestationCAClient>(), |
| 368 base::TimeDelta::FromMinutes(1)); |
368 } | 369 } |
369 | 370 |
370 chromeos::AffiliationIDSet | 371 chromeos::AffiliationIDSet |
371 BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const { | 372 BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const { |
372 chromeos::AffiliationIDSet affiliation_ids; | 373 chromeos::AffiliationIDSet affiliation_ids; |
373 if (device_cloud_policy_manager_) { | 374 if (device_cloud_policy_manager_) { |
374 const enterprise_management::PolicyData* const policy_data = | 375 const enterprise_management::PolicyData* const policy_data = |
375 device_cloud_policy_manager_->device_store()->policy(); | 376 device_cloud_policy_manager_->device_store()->policy(); |
376 if (policy_data) { | 377 if (policy_data) { |
377 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 378 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
378 policy_data->device_affiliation_ids().end()); | 379 policy_data->device_affiliation_ids().end()); |
379 } | 380 } |
380 } | 381 } |
381 return affiliation_ids; | 382 return affiliation_ids; |
382 } | 383 } |
383 | 384 |
384 } // namespace policy | 385 } // namespace policy |
OLD | NEW |