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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/message_loop/message_loop_proxy.h" | 16 #include "base/message_loop/message_loop_proxy.h" |
17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
18 #include "base/prefs/pref_registry_simple.h" | 18 #include "base/prefs/pref_registry_simple.h" |
19 #include "base/prefs/pref_service.h" | 19 #include "base/prefs/pref_service.h" |
| 20 #include "base/sequenced_task_runner.h" |
20 #include "base/strings/string_util.h" | 21 #include "base/strings/string_util.h" |
21 #include "base/strings/stringprintf.h" | 22 #include "base/strings/stringprintf.h" |
22 #include "base/strings/sys_string_conversions.h" | 23 #include "base/strings/sys_string_conversions.h" |
23 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
24 #include "base/sys_info.h" | 25 #include "base/sys_info.h" |
| 26 #include "base/threading/sequenced_worker_pool.h" |
25 #include "chrome/browser/browser_process.h" | 27 #include "chrome/browser/browser_process.h" |
26 #include "chrome/browser/policy/async_policy_provider.h" | 28 #include "chrome/browser/policy/async_policy_provider.h" |
27 #include "chrome/browser/policy/cloud/cloud_policy_client.h" | 29 #include "chrome/browser/policy/cloud/cloud_policy_client.h" |
28 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h" | 30 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h" |
29 #include "chrome/browser/policy/cloud/cloud_policy_service.h" | 31 #include "chrome/browser/policy/cloud/cloud_policy_service.h" |
30 #include "chrome/browser/policy/cloud/device_management_service.h" | 32 #include "chrome/browser/policy/cloud/device_management_service.h" |
31 #include "chrome/browser/policy/configuration_policy_provider.h" | 33 #include "chrome/browser/policy/configuration_policy_provider.h" |
32 #include "chrome/browser/policy/policy_domain_descriptor.h" | 34 #include "chrome/browser/policy/policy_domain_descriptor.h" |
33 #include "chrome/browser/policy/policy_service_impl.h" | 35 #include "chrome/browser/policy/policy_service_impl.h" |
34 #include "chrome/browser/policy/policy_statistics_collector.h" | 36 #include "chrome/browser/policy/policy_statistics_collector.h" |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 chromeos::system::StatisticsProvider::GetInstance(), | 272 chromeos::system::StatisticsProvider::GetInstance(), |
271 NULL)); | 273 NULL)); |
272 device_cloud_policy_manager_->Connect( | 274 device_cloud_policy_manager_->Connect( |
273 local_state_, | 275 local_state_, |
274 device_management_service_.get(), | 276 device_management_service_.get(), |
275 status_provider.Pass()); | 277 status_provider.Pass()); |
276 } | 278 } |
277 | 279 |
278 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 280 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
279 if (!command_line->HasSwitch(chromeos::switches::kDisableLocalAccounts)) { | 281 if (!command_line->HasSwitch(chromeos::switches::kDisableLocalAccounts)) { |
| 282 base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool(); |
280 device_local_account_policy_service_.reset( | 283 device_local_account_policy_service_.reset( |
281 new DeviceLocalAccountPolicyService( | 284 new DeviceLocalAccountPolicyService( |
282 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), | 285 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), |
283 chromeos::DeviceSettingsService::Get(), | 286 chromeos::DeviceSettingsService::Get(), |
284 chromeos::CrosSettings::Get())); | 287 chromeos::CrosSettings::Get(), |
| 288 blocking_pool->GetSequencedTaskRunnerWithShutdownBehavior( |
| 289 blocking_pool->GetSequenceToken(), |
| 290 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))); |
285 device_local_account_policy_service_->Connect( | 291 device_local_account_policy_service_->Connect( |
286 device_management_service_.get()); | 292 device_management_service_.get()); |
287 } | 293 } |
288 | 294 |
289 GetAppPackUpdater(); | 295 GetAppPackUpdater(); |
290 | 296 |
291 SetTimezoneIfPolicyAvailable(); | 297 SetTimezoneIfPolicyAvailable(); |
292 #endif | 298 #endif |
293 | 299 |
294 policy_statistics_collector_.reset( | 300 policy_statistics_collector_.reset( |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 return new AsyncPolicyProvider(loader.Pass()); | 564 return new AsyncPolicyProvider(loader.Pass()); |
559 } else { | 565 } else { |
560 return NULL; | 566 return NULL; |
561 } | 567 } |
562 #else | 568 #else |
563 return NULL; | 569 return NULL; |
564 #endif | 570 #endif |
565 } | 571 } |
566 | 572 |
567 } // namespace policy | 573 } // namespace policy |
OLD | NEW |