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" |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 local_state_, | 181 local_state_, |
182 device_management_service_.get(), | 182 device_management_service_.get(), |
183 status_provider.Pass()); | 183 status_provider.Pass()); |
184 } | 184 } |
185 | 185 |
186 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 186 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
187 if (!command_line->HasSwitch(chromeos::switches::kDisableLocalAccounts)) { | 187 if (!command_line->HasSwitch(chromeos::switches::kDisableLocalAccounts)) { |
188 device_local_account_policy_service_.reset( | 188 device_local_account_policy_service_.reset( |
189 new DeviceLocalAccountPolicyService( | 189 new DeviceLocalAccountPolicyService( |
190 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), | 190 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), |
191 chromeos::DeviceSettingsService::Get())); | 191 chromeos::DeviceSettingsService::Get(), |
| 192 chromeos::CrosSettings::Get())); |
192 device_local_account_policy_service_->Connect( | 193 device_local_account_policy_service_->Connect( |
193 device_management_service_.get()); | 194 device_management_service_.get()); |
194 } | 195 } |
195 | 196 |
196 GetAppPackUpdater(); | 197 GetAppPackUpdater(); |
197 | 198 |
198 SetTimezoneIfPolicyAvailable(); | 199 SetTimezoneIfPolicyAvailable(); |
199 #endif | 200 #endif |
200 | 201 |
201 policy_statistics_collector_.reset( | 202 policy_statistics_collector_.reset( |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 return new AsyncPolicyProvider(loader.Pass()); | 485 return new AsyncPolicyProvider(loader.Pass()); |
485 } else { | 486 } else { |
486 return NULL; | 487 return NULL; |
487 } | 488 } |
488 #else | 489 #else |
489 return NULL; | 490 return NULL; |
490 #endif | 491 #endif |
491 } | 492 } |
492 | 493 |
493 } // namespace policy | 494 } // namespace policy |
OLD | NEW |