Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Side by Side Diff: chrome/browser/net/nss_context_chromeos.cc

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/net/nss_context.h ('k') | chrome/browser/net/predictor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/net/nss_context.h" 5 #include "chrome/browser/net/nss_context.h"
6 6
7 #include "base/macros.h"
7 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
8 #include "base/supports_user_data.h" 9 #include "base/supports_user_data.h"
9 #include "chrome/browser/profiles/profile_io_data.h" 10 #include "chrome/browser/profiles/profile_io_data.h"
10 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
11 #include "crypto/nss_util_internal.h" 12 #include "crypto/nss_util_internal.h"
12 #include "net/cert/nss_cert_database_chromeos.h" 13 #include "net/cert/nss_cert_database_chromeos.h"
13 14
14 namespace { 15 namespace {
15 16
16 void* kDatabaseManagerKey = &kDatabaseManagerKey; 17 void* kDatabaseManagerKey = &kDatabaseManagerKey;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 137
137 void EnableNSSSystemKeySlotForResourceContext( 138 void EnableNSSSystemKeySlotForResourceContext(
138 content::ResourceContext* context) { 139 content::ResourceContext* context) {
139 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 140 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
140 base::Callback<void(crypto::ScopedPK11Slot)> callback = 141 base::Callback<void(crypto::ScopedPK11Slot)> callback =
141 base::Bind(&SetSystemSlotOfDBForResourceContext, context); 142 base::Bind(&SetSystemSlotOfDBForResourceContext, context);
142 crypto::ScopedPK11Slot system_slot = crypto::GetSystemNSSKeySlot(callback); 143 crypto::ScopedPK11Slot system_slot = crypto::GetSystemNSSKeySlot(callback);
143 if (system_slot) 144 if (system_slot)
144 callback.Run(system_slot.Pass()); 145 callback.Run(system_slot.Pass());
145 } 146 }
OLDNEW
« no previous file with comments | « chrome/browser/net/nss_context.h ('k') | chrome/browser/net/predictor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698