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/chromeos/settings/device_settings_service.h" | 5 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 | 228 |
229 void DeviceSettingsService::PropertyChangeComplete(bool success) { | 229 void DeviceSettingsService::PropertyChangeComplete(bool success) { |
230 if (!success) { | 230 if (!success) { |
231 LOG(ERROR) << "Policy update failed."; | 231 LOG(ERROR) << "Policy update failed."; |
232 return; | 232 return; |
233 } | 233 } |
234 | 234 |
235 EnsureReload(false); | 235 EnsureReload(false); |
236 } | 236 } |
237 | 237 |
238 void DeviceSettingsService::OnTPMTokenReady(const std::string& tpm_user_pin, | 238 void DeviceSettingsService::OnTPMTokenReady() { |
239 const std::string& tpm_token_name, | |
240 int tpm_token_slot_id) { | |
241 waiting_for_tpm_token_ = false; | 239 waiting_for_tpm_token_ = false; |
242 | 240 |
243 // TPMTokenLoader initializes the TPM and NSS database which is necessary to | 241 // TPMTokenLoader initializes the TPM and NSS database which is necessary to |
244 // determine ownership. Force a reload once we know these are initialized. | 242 // determine ownership. Force a reload once we know these are initialized. |
245 EnsureReload(true); | 243 EnsureReload(true); |
246 } | 244 } |
247 | 245 |
248 void DeviceSettingsService::Enqueue(SessionManagerOperation* operation) { | 246 void DeviceSettingsService::Enqueue(SessionManagerOperation* operation) { |
249 pending_operations_.push_back(operation); | 247 pending_operations_.push_back(operation); |
250 if (pending_operations_.front() == operation) | 248 if (pending_operations_.front() == operation) |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 DeviceSettingsService::Initialize(); | 365 DeviceSettingsService::Initialize(); |
368 } | 366 } |
369 | 367 |
370 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { | 368 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { |
371 // Clean pending operations. | 369 // Clean pending operations. |
372 DeviceSettingsService::Get()->UnsetSessionManager(); | 370 DeviceSettingsService::Get()->UnsetSessionManager(); |
373 DeviceSettingsService::Shutdown(); | 371 DeviceSettingsService::Shutdown(); |
374 } | 372 } |
375 | 373 |
376 } // namespace chromeos | 374 } // namespace chromeos |
OLD | NEW |