diff options
| author | atwilson <atwilson@chromium.org> | 2015-02-27 09:13:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-27 17:14:05 +0000 |
| commit | 0fabd51a7b69707cc9faf02c004aabc3b4f4b1da (patch) | |
| tree | 1c123739fe863db9efbe5623902c6847e4a449ac /chrome/browser/browser_process_impl.cc | |
| parent | 93c53be1cb22bfaec6b5c201ddd6150a813acaf6 (diff) | |
| download | chromium_src-0fabd51a7b69707cc9faf02c004aabc3b4f4b1da.zip chromium_src-0fabd51a7b69707cc9faf02c004aabc3b4f4b1da.tar.gz chromium_src-0fabd51a7b69707cc9faf02c004aabc3b4f4b1da.tar.bz2 | |
Added support for monitoring heartbeats over the GCM channel.
Wired up the HeartbeatEnabled and HeartbeatFrequency policies.
Added new HeartbeatScheduler class that registers with the GCMDriver() and sends
heartbeats over the GCM channel to the management server.
BUG=430908
Review URL: https://codereview.chromium.org/941713003
Cr-Commit-Position: refs/heads/master@{#318471}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 9fd1a60..2f86717 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -291,7 +291,9 @@ void BrowserProcessImpl::StartTearDown() { #if defined(ENABLE_CONFIGURATION_POLICY) // The policy providers managed by |browser_policy_connector_| need to shut - // down while the IO and FILE threads are still alive. + // down while the IO and FILE threads are still alive. The monitoring + // framework owned by |browser_policy_connector_| relies on |gcm_driver_|, so + // this must be shutdown before |gcm_driver_| below. if (browser_policy_connector_) browser_policy_connector_->Shutdown(); #endif |