diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 17:48:49 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 17:48:49 +0000 |
| commit | 60833392e57ba72933e6007dbb8c4cc9206a8b74 (patch) | |
| tree | 05c2abe4bef09334e5553dae8d79e01b710f536e /chromeos/chromeos.gyp | |
| parent | 8f61914919ce717ef09edeaa21b217e2f737061f (diff) | |
| download | chromium_src-60833392e57ba72933e6007dbb8c4cc9206a8b74.zip chromium_src-60833392e57ba72933e6007dbb8c4cc9206a8b74.tar.gz chromium_src-60833392e57ba72933e6007dbb8c4cc9206a8b74.tar.bz2 | |
Call crypto::InitializeTPMToken on the IO thread (Take 2)
This is identical to https://chromiumcodereview.appspot.com/15649018
with the following addition:
Call DeviceSettingsService::EnsureReload once certs are loaded
BUG=244455
R=mnissler@chromium.org, nkostylev@chromium.org, rsleevi@chromium.org, xiyuan@chromium.org
Review URL: https://codereview.chromium.org/20130002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/chromeos.gyp')
| -rw-r--r-- | chromeos/chromeos.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 04459d6..f387c94 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -46,6 +46,8 @@ 'attestation/attestation_constants.h', 'attestation/attestation_flow.cc', 'attestation/attestation_flow.h', + 'cert_loader.cc', + 'cert_loader.h', 'chromeos_constants.cc', 'chromeos_constants.h', 'chromeos_export.h', @@ -209,8 +211,6 @@ 'ime/xkeyboard.h', 'login/login_state.cc', 'login/login_state.h', - 'network/cert_loader.cc', - 'network/cert_loader.h', 'network/certificate_pattern.cc', 'network/certificate_pattern.h', 'network/certificate_pattern_matcher.cc', |