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

Side by Side Diff: chrome/browser/renderer_host/resource_message_filter.cc

Issue 5686002: NSS: PKCS 11 password prompt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/renderer_host/resource_message_filter.h" 5 #include "chrome/browser/renderer_host/resource_message_filter.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/renderer_host/browser_render_process_host.h" 47 #include "chrome/browser/renderer_host/browser_render_process_host.h"
48 #include "chrome/browser/renderer_host/database_dispatcher_host.h" 48 #include "chrome/browser/renderer_host/database_dispatcher_host.h"
49 #include "chrome/browser/renderer_host/file_utilities_dispatcher_host.h" 49 #include "chrome/browser/renderer_host/file_utilities_dispatcher_host.h"
50 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 50 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
51 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" 51 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
52 #include "chrome/browser/renderer_host/render_widget_helper.h" 52 #include "chrome/browser/renderer_host/render_widget_helper.h"
53 #include "chrome/browser/search_engines/search_provider_install_state_dispatcher _host.h" 53 #include "chrome/browser/search_engines/search_provider_install_state_dispatcher _host.h"
54 #include "chrome/browser/speech/speech_input_dispatcher_host.h" 54 #include "chrome/browser/speech/speech_input_dispatcher_host.h"
55 #include "chrome/browser/spellchecker_platform_engine.h" 55 #include "chrome/browser/spellchecker_platform_engine.h"
56 #include "chrome/browser/task_manager/task_manager.h" 56 #include "chrome/browser/task_manager/task_manager.h"
57 #if defined(USE_NSS)
58 #include "chrome/browser/ui/pk11_password_dialog.h"
59 #endif // defined(USE_NSS)
57 #include "chrome/browser/worker_host/message_port_dispatcher.h" 60 #include "chrome/browser/worker_host/message_port_dispatcher.h"
58 #include "chrome/browser/worker_host/worker_service.h" 61 #include "chrome/browser/worker_host/worker_service.h"
59 #include "chrome/common/chrome_switches.h" 62 #include "chrome/common/chrome_switches.h"
60 #include "chrome/common/extensions/extension_file_util.h" 63 #include "chrome/common/extensions/extension_file_util.h"
61 #include "chrome/common/extensions/extension_message_bundle.h" 64 #include "chrome/common/extensions/extension_message_bundle.h"
62 #include "chrome/common/notification_service.h" 65 #include "chrome/common/notification_service.h"
63 #include "chrome/common/render_messages.h" 66 #include "chrome/common/render_messages.h"
64 #include "chrome/common/render_messages_params.h" 67 #include "chrome/common/render_messages_params.h"
65 #include "chrome/common/url_constants.h" 68 #include "chrome/common/url_constants.h"
66 #include "ipc/ipc_channel_handle.h" 69 #include "ipc/ipc_channel_handle.h"
(...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 void ResourceMessageFilter::OnKeygenOnWorkerThread( 1588 void ResourceMessageFilter::OnKeygenOnWorkerThread(
1586 int key_size_in_bits, 1589 int key_size_in_bits,
1587 const std::string& challenge_string, 1590 const std::string& challenge_string,
1588 const GURL& url, 1591 const GURL& url,
1589 IPC::Message* reply_msg) { 1592 IPC::Message* reply_msg) {
1590 DCHECK(reply_msg); 1593 DCHECK(reply_msg);
1591 1594
1592 // Generate a signed public key and challenge, then send it back. 1595 // Generate a signed public key and challenge, then send it back.
1593 net::KeygenHandler keygen_handler(key_size_in_bits, challenge_string, url); 1596 net::KeygenHandler keygen_handler(key_size_in_bits, challenge_string, url);
1594 1597
1598 #if defined(USE_NSS)
1599 // Attach a password delegate so we can authenticate.
1600 keygen_handler.set_pk11_password_delegate(
1601 browser::NewPK11BlockingDialogDelegate(browser::kPK11PasswordKeygen,
1602 url.host()));
1603 #endif // defined(USE_NSS)
1604
1595 ViewHostMsg_Keygen::WriteReplyParams( 1605 ViewHostMsg_Keygen::WriteReplyParams(
1596 reply_msg, 1606 reply_msg,
1597 keygen_handler.GenKeyAndSignChallenge()); 1607 keygen_handler.GenKeyAndSignChallenge());
1598 1608
1599 BrowserThread::PostTask( 1609 BrowserThread::PostTask(
1600 BrowserThread::IO, FROM_HERE, 1610 BrowserThread::IO, FROM_HERE,
1601 NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg)); 1611 NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg));
1602 } 1612 }
1603 1613
1604 #if defined(USE_TCMALLOC) 1614 #if defined(USE_TCMALLOC)
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 } 1834 }
1825 1835
1826 CookiesEnabledCompletion::~CookiesEnabledCompletion() {} 1836 CookiesEnabledCompletion::~CookiesEnabledCompletion() {}
1827 1837
1828 void CookiesEnabledCompletion::RunWithParams(const Tuple1<int>& params) { 1838 void CookiesEnabledCompletion::RunWithParams(const Tuple1<int>& params) {
1829 bool result = params.a != net::ERR_ACCESS_DENIED; 1839 bool result = params.a != net::ERR_ACCESS_DENIED;
1830 ViewHostMsg_CookiesEnabled::WriteReplyParams(reply_msg_, result); 1840 ViewHostMsg_CookiesEnabled::WriteReplyParams(reply_msg_, result);
1831 filter_->Send(reply_msg_); 1841 filter_->Send(reply_msg_);
1832 delete this; 1842 delete this;
1833 } 1843 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698