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

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: unit_test compile fix Created 7 years 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
11 #if defined(USE_NSS)
jam 2013/12/12 06:42:50 ditto
mattm 2013/12/12 21:49:18 Done.
12 #include "crypto/nss_crypto_module_delegate.h"
13 #endif
14
11 namespace content { 15 namespace content {
12 16
13 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( 17 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
14 const MainFunctionParams& parameters) { 18 const MainFunctionParams& parameters) {
15 return NULL; 19 return NULL;
16 } 20 }
17 21
18 WebContentsViewPort* ContentBrowserClient::OverrideCreateWebContentsView( 22 WebContentsViewPort* ContentBrowserClient::OverrideCreateWebContentsView(
19 WebContents* web_contents, 23 WebContents* web_contents,
20 RenderViewHostDelegateView** render_view_host_delegate_view) { 24 RenderViewHostDelegateView** render_view_host_delegate_view) {
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 VibrationProvider* ContentBrowserClient::OverrideVibrationProvider() { 295 VibrationProvider* ContentBrowserClient::OverrideVibrationProvider() {
292 return NULL; 296 return NULL;
293 } 297 }
294 298
295 #if defined(OS_WIN) 299 #if defined(OS_WIN)
296 const wchar_t* ContentBrowserClient::GetResourceDllName() { 300 const wchar_t* ContentBrowserClient::GetResourceDllName() {
297 return NULL; 301 return NULL;
298 } 302 }
299 #endif 303 #endif
300 304
301 #if defined(USE_NSS)
302 crypto::CryptoModuleBlockingPasswordDelegate*
303 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
304 return NULL;
305 }
306 #endif
307
308 bool ContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 305 bool ContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
309 content::BrowserContext* browser_context, 306 content::BrowserContext* browser_context,
310 const GURL& url) { 307 const GURL& url) {
311 return false; 308 return false;
312 } 309 }
313 310
314 } // namespace content 311 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698