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 18 matching lines...) Expand all Loading... |
29 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" | 29 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" |
30 #include "chrome/browser/chromeos/policy/device_local_account.h" | 30 #include "chrome/browser/chromeos/policy/device_local_account.h" |
31 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 31 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
32 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" | 32 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" |
33 #include "chrome/browser/chromeos/policy/enrollment_config.h" | 33 #include "chrome/browser/chromeos/policy/enrollment_config.h" |
34 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_comma
nds_invalidator.h" | 34 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_comma
nds_invalidator.h" |
35 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" | 35 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" |
36 #include "chrome/browser/chromeos/settings/cros_settings.h" | 36 #include "chrome/browser/chromeos/settings/cros_settings.h" |
37 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 37 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
38 #include "chrome/browser/chromeos/settings/install_attributes.h" | 38 #include "chrome/browser/chromeos/settings/install_attributes.h" |
| 39 #include "chrome/browser/chromeos/system/timezone_util.h" |
39 #include "chrome/browser/policy/device_management_service_configuration.h" | 40 #include "chrome/browser/policy/device_management_service_configuration.h" |
40 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
41 #include "chromeos/attestation/attestation_flow.h" | 42 #include "chromeos/attestation/attestation_flow.h" |
42 #include "chromeos/chromeos_paths.h" | 43 #include "chromeos/chromeos_paths.h" |
43 #include "chromeos/chromeos_switches.h" | 44 #include "chromeos/chromeos_switches.h" |
44 #include "chromeos/cryptohome/async_method_caller.h" | 45 #include "chromeos/cryptohome/async_method_caller.h" |
45 #include "chromeos/cryptohome/system_salt_getter.h" | 46 #include "chromeos/cryptohome/system_salt_getter.h" |
46 #include "chromeos/dbus/cryptohome_client.h" | 47 #include "chromeos/dbus/cryptohome_client.h" |
47 #include "chromeos/dbus/dbus_thread_manager.h" | 48 #include "chromeos/dbus/dbus_thread_manager.h" |
48 #include "chromeos/dbus/upstart_client.h" | 49 #include "chromeos/dbus/upstart_client.h" |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 &BrowserPolicyConnectorChromeOS::SetTimezoneIfPolicyAvailable, | 337 &BrowserPolicyConnectorChromeOS::SetTimezoneIfPolicyAvailable, |
337 weak_ptr_factory_.GetWeakPtr())); | 338 weak_ptr_factory_.GetWeakPtr())); |
338 | 339 |
339 if (result != Provider::TRUSTED) | 340 if (result != Provider::TRUSTED) |
340 return; | 341 return; |
341 | 342 |
342 std::string timezone; | 343 std::string timezone; |
343 if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy, | 344 if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy, |
344 &timezone) && | 345 &timezone) && |
345 !timezone.empty()) { | 346 !timezone.empty()) { |
346 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 347 chromeos::system::SetSystemAndSigninScreenTimezone(timezone); |
347 base::UTF8ToUTF16(timezone)); | |
348 } | 348 } |
349 } | 349 } |
350 | 350 |
351 void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() { | 351 void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() { |
352 device_cloud_policy_initializer_ = | 352 device_cloud_policy_initializer_ = |
353 base::MakeUnique<DeviceCloudPolicyInitializer>( | 353 base::MakeUnique<DeviceCloudPolicyInitializer>( |
354 local_state_, device_management_service(), GetBackgroundTaskRunner(), | 354 local_state_, device_management_service(), GetBackgroundTaskRunner(), |
355 install_attributes_.get(), state_keys_broker_.get(), | 355 install_attributes_.get(), state_keys_broker_.get(), |
356 device_cloud_policy_manager_->device_store(), | 356 device_cloud_policy_manager_->device_store(), |
357 device_cloud_policy_manager_, | 357 device_cloud_policy_manager_, |
(...skipping 18 matching lines...) Expand all Loading... |
376 device_cloud_policy_manager_->device_store()->policy(); | 376 device_cloud_policy_manager_->device_store()->policy(); |
377 if (policy_data) { | 377 if (policy_data) { |
378 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 378 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
379 policy_data->device_affiliation_ids().end()); | 379 policy_data->device_affiliation_ids().end()); |
380 } | 380 } |
381 } | 381 } |
382 return affiliation_ids; | 382 return affiliation_ids; |
383 } | 383 } |
384 | 384 |
385 } // namespace policy | 385 } // namespace policy |
OLD | NEW |