| Index: chrome/browser/net/nss_context.cc
|
| diff --git a/chrome/browser/net/nss_context.cc b/chrome/browser/net/nss_context.cc
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..521142701e89ad989c4ab06500e7799ffd62fa78
|
| --- /dev/null
|
| +++ b/chrome/browser/net/nss_context.cc
|
| @@ -0,0 +1,46 @@
|
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
| +
|
| +#include "chrome/browser/net/nss_context.h"
|
| +
|
| +#include "chrome/browser/profiles/profile_io_data.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| +#include "crypto/nss_util_internal.h"
|
| +
|
| +namespace {
|
| +#if defined(OS_CHROMEOS)
|
| +std::string GetUsername(content::ResourceContext* context) {
|
| + return ProfileIOData::FromResourceContext(context)->username_hash();
|
| +}
|
| +#endif // defined(OS_CHROMEOS)
|
| +} // namespace
|
| +
|
| +void OnPrivateNSSKeySlotForResourceContextReady(
|
| + content::ResourceContext* context,
|
| + const base::Callback<void(crypto::ScopedPK11Slot)>& callback) {
|
| + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
|
| +#if defined(OS_CHROMEOS)
|
| + crypto::OnPrivateSlotReadyForChromeOSUser(GetUsername(context), callback);
|
| +#else
|
| + callback.Run(crypto::ScopedPK11Slot(crypto::GetPrivateNSSKeySlot()));
|
| +#endif
|
| +}
|
| +
|
| +void OnNSSKeySlotsForResourceContextReady(
|
| + content::ResourceContext* context,
|
| + const base::Callback<
|
| + void(crypto::ScopedPK11Slot, crypto::ScopedPK11Slot)>& callback) {
|
| + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
|
| +#if defined(OS_CHROMEOS)
|
| + std::string username_hash = GetUsername(context);
|
| + crypto::OnPrivateSlotReadyForChromeOSUser(
|
| + username_hash,
|
| + base::Bind(
|
| + callback,
|
| + base::Passed(crypto::GetPublicSlotForChromeOSUser(username_hash))));
|
| +#else
|
| + callback.Run(crypto::ScopedPK11Slot(crypto::GetPublicNSSKeySlot()),
|
| + crypto::ScopedPK11Slot(crypto::GetPrivateNSSKeySlot()));
|
| +#endif
|
| +}
|
|
|