| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/policy/browser_policy_connector.h" | 5 #include "chrome/browser/policy/browser_policy_connector.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 #if defined(OS_CHROMEOS) | 150 #if defined(OS_CHROMEOS) |
| 151 // Shutdown device cloud policy. | 151 // Shutdown device cloud policy. |
| 152 if (device_cloud_policy_subsystem_) | 152 if (device_cloud_policy_subsystem_) |
| 153 device_cloud_policy_subsystem_->Shutdown(); | 153 device_cloud_policy_subsystem_->Shutdown(); |
| 154 // The AppPackUpdater may be observing the |device_cloud_policy_subsystem_|. | 154 // The AppPackUpdater may be observing the |device_cloud_policy_subsystem_|. |
| 155 // Delete it first. | 155 // Delete it first. |
| 156 app_pack_updater_.reset(); | 156 app_pack_updater_.reset(); |
| 157 device_cloud_policy_subsystem_.reset(); | 157 device_cloud_policy_subsystem_.reset(); |
| 158 device_data_store_.reset(); | 158 device_data_store_.reset(); |
| 159 | 159 |
| 160 device_cloud_policy_manager_->Shutdown(); | 160 if (device_cloud_policy_manager_) |
| 161 device_cloud_policy_manager_->Shutdown(); |
| 161 #endif | 162 #endif |
| 162 | 163 |
| 163 // Shutdown user cloud policy. | 164 // Shutdown user cloud policy. |
| 164 if (user_cloud_policy_subsystem_) | 165 if (user_cloud_policy_subsystem_) |
| 165 user_cloud_policy_subsystem_->Shutdown(); | 166 user_cloud_policy_subsystem_->Shutdown(); |
| 166 user_cloud_policy_subsystem_.reset(); | 167 user_cloud_policy_subsystem_.reset(); |
| 167 user_policy_token_cache_.reset(); | 168 user_policy_token_cache_.reset(); |
| 168 user_data_store_.reset(); | 169 user_data_store_.reset(); |
| 169 | 170 |
| 170 device_management_service_.reset(); | 171 device_management_service_.reset(); |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 return new AsyncPolicyProvider(loader.Pass()); | 667 return new AsyncPolicyProvider(loader.Pass()); |
| 667 } else { | 668 } else { |
| 668 return NULL; | 669 return NULL; |
| 669 } | 670 } |
| 670 #else | 671 #else |
| 671 return NULL; | 672 return NULL; |
| 672 #endif | 673 #endif |
| 673 } | 674 } |
| 674 | 675 |
| 675 } // namespace policy | 676 } // namespace policy |
| OLD | NEW |