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

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 845313008: Refactored device status uploading out of policy fetch infrastructure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review feedback. Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/message_loop/message_loop_proxy.h" 14 #include "base/message_loop/message_loop_proxy.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/prefs/pref_registry_simple.h" 16 #include "base/prefs/pref_registry_simple.h"
17 #include "base/sequenced_task_runner.h" 17 #include "base/sequenced_task_runner.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/threading/sequenced_worker_pool.h" 19 #include "base/threading/sequenced_worker_pool.h"
20 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 20 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
21 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" 21 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
22 #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h" 22 #include "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
23 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 23 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
24 #include "chrome/browser/chromeos/policy/device_local_account.h" 24 #include "chrome/browser/chromeos/policy/device_local_account.h"
25 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 25 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
26 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" 26 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
27 #include "chrome/browser/chromeos/policy/enrollment_config.h" 27 #include "chrome/browser/chromeos/policy/enrollment_config.h"
28 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 28 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
29 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" 29 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
30 #include "chrome/browser/chromeos/policy/status_uploader.h"
30 #include "chrome/browser/chromeos/settings/cros_settings.h" 31 #include "chrome/browser/chromeos/settings/cros_settings.h"
31 #include "chrome/browser/chromeos/settings/device_settings_service.h" 32 #include "chrome/browser/chromeos/settings/device_settings_service.h"
32 #include "chrome/browser/policy/device_management_service_configuration.h" 33 #include "chrome/browser/policy/device_management_service_configuration.h"
33 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
34 #include "chromeos/chromeos_paths.h" 35 #include "chromeos/chromeos_paths.h"
35 #include "chromeos/chromeos_switches.h" 36 #include "chromeos/chromeos_switches.h"
36 #include "chromeos/cryptohome/system_salt_getter.h" 37 #include "chromeos/cryptohome/system_salt_getter.h"
37 #include "chromeos/dbus/cryptohome_client.h" 38 #include "chromeos/dbus/cryptohome_client.h"
38 #include "chromeos/dbus/dbus_thread_manager.h" 39 #include "chromeos/dbus/dbus_thread_manager.h"
39 #include "chromeos/network/network_handler.h" 40 #include "chromeos/network/network_handler.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 g_testing_install_attributes = NULL; 296 g_testing_install_attributes = NULL;
296 } 297 }
297 } 298 }
298 299
299 // static 300 // static
300 void BrowserPolicyConnectorChromeOS::RegisterPrefs( 301 void BrowserPolicyConnectorChromeOS::RegisterPrefs(
301 PrefRegistrySimple* registry) { 302 PrefRegistrySimple* registry) {
302 registry->RegisterIntegerPref( 303 registry->RegisterIntegerPref(
303 prefs::kDevicePolicyRefreshRate, 304 prefs::kDevicePolicyRefreshRate,
304 CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs); 305 CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs);
306 registry->RegisterIntegerPref(
307 prefs::kDeviceStatusUploadRate,
308 StatusUploader::kDefaultUploadDelayMs);
305 } 309 }
306 310
307 void BrowserPolicyConnectorChromeOS::OnDeviceCloudPolicyManagerConnected() { 311 void BrowserPolicyConnectorChromeOS::OnDeviceCloudPolicyManagerConnected() {
308 CHECK(device_cloud_policy_initializer_); 312 CHECK(device_cloud_policy_initializer_);
309 313
310 // DeviceCloudPolicyInitializer might still be on the call stack, so we 314 // DeviceCloudPolicyInitializer might still be on the call stack, so we
311 // should release the initializer after this function returns. 315 // should release the initializer after this function returns.
312 device_cloud_policy_initializer_->Shutdown(); 316 device_cloud_policy_initializer_->Shutdown();
313 base::MessageLoop::current()->DeleteSoon( 317 base::MessageLoop::current()->DeleteSoon(
314 FROM_HERE, device_cloud_policy_initializer_.release()); 318 FROM_HERE, device_cloud_policy_initializer_.release());
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 consumer_device_management_service_.get(), 351 consumer_device_management_service_.get(),
348 GetBackgroundTaskRunner(), 352 GetBackgroundTaskRunner(),
349 install_attributes_.get(), 353 install_attributes_.get(),
350 state_keys_broker_.get(), 354 state_keys_broker_.get(),
351 device_cloud_policy_manager_->device_store(), 355 device_cloud_policy_manager_->device_store(),
352 device_cloud_policy_manager_)); 356 device_cloud_policy_manager_));
353 device_cloud_policy_initializer_->Init(); 357 device_cloud_policy_initializer_->Init();
354 } 358 }
355 359
356 } // namespace policy 360 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698