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

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r235279 Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
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 "content/public/browser/content_browser_client.h" 5 #include "content/public/browser/content_browser_client.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "url/gurl.h" 9 #include "url/gurl.h"
10 10
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 return NULL; 288 return NULL;
289 } 289 }
290 290
291 #if defined(OS_WIN) 291 #if defined(OS_WIN)
292 const wchar_t* ContentBrowserClient::GetResourceDllName() { 292 const wchar_t* ContentBrowserClient::GetResourceDllName() {
293 return NULL; 293 return NULL;
294 } 294 }
295 #endif 295 #endif
296 296
297 #if defined(USE_NSS) 297 #if defined(USE_NSS)
298 crypto::CryptoModuleBlockingPasswordDelegate* 298 crypto::NSSCryptoModuleDelegate*
299 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { 299 ContentBrowserClient::GetKeygenCryptoModuleDelegate(ResourceContext* context,
300 const GURL& url) {
300 return NULL; 301 return NULL;
301 } 302 }
302 #endif 303 #endif
303 304
304 bool ContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 305 bool ContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
305 content::BrowserContext* browser_context, 306 content::BrowserContext* browser_context,
306 const GURL& url) { 307 const GURL& url) {
307 return false; 308 return false;
308 } 309 }
309 310
310 } // namespace content 311 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698