OLD | NEW |
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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "chrome/browser/extensions/extension_web_ui.h" | 43 #include "chrome/browser/extensions/extension_web_ui.h" |
44 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 44 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
45 #include "chrome/browser/extensions/suggest_permission_util.h" | 45 #include "chrome/browser/extensions/suggest_permission_util.h" |
46 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 46 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
47 #include "chrome/browser/google/google_util.h" | 47 #include "chrome/browser/google/google_util.h" |
48 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 48 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
49 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 49 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
50 #include "chrome/browser/nacl_host/nacl_host_message_filter.h" | 50 #include "chrome/browser/nacl_host/nacl_host_message_filter.h" |
51 #include "chrome/browser/nacl_host/nacl_process_host.h" | 51 #include "chrome/browser/nacl_host/nacl_process_host.h" |
52 #include "chrome/browser/net/chrome_net_log.h" | 52 #include "chrome/browser/net/chrome_net_log.h" |
| 53 #include "chrome/browser/net/keygen_handler.h" |
53 #include "chrome/browser/notifications/desktop_notification_service.h" | 54 #include "chrome/browser/notifications/desktop_notification_service.h" |
54 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 55 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
55 #include "chrome/browser/platform_util.h" | 56 #include "chrome/browser/platform_util.h" |
56 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 57 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
57 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 58 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
58 #include "chrome/browser/prerender/prerender_manager.h" | 59 #include "chrome/browser/prerender/prerender_manager.h" |
59 #include "chrome/browser/prerender/prerender_manager_factory.h" | 60 #include "chrome/browser/prerender/prerender_manager_factory.h" |
60 #include "chrome/browser/prerender/prerender_message_filter.h" | 61 #include "chrome/browser/prerender/prerender_message_filter.h" |
61 #include "chrome/browser/prerender/prerender_tracker.h" | 62 #include "chrome/browser/prerender/prerender_tracker.h" |
62 #include "chrome/browser/printing/printing_message_filter.h" | 63 #include "chrome/browser/printing/printing_message_filter.h" |
(...skipping 1625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1688 net::URLRequest* request, | 1689 net::URLRequest* request, |
1689 net::CertificateMimeType cert_type, | 1690 net::CertificateMimeType cert_type, |
1690 const void* cert_data, | 1691 const void* cert_data, |
1691 size_t cert_size, | 1692 size_t cert_size, |
1692 int render_process_id, | 1693 int render_process_id, |
1693 int render_view_id) { | 1694 int render_view_id) { |
1694 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, | 1695 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, |
1695 render_process_id, render_view_id); | 1696 render_process_id, render_view_id); |
1696 } | 1697 } |
1697 | 1698 |
| 1699 void ChromeContentBrowserClient::Keygen( |
| 1700 content::ResourceContext* context, |
| 1701 int key_size_in_bits, |
| 1702 const std::string& challenge, |
| 1703 const GURL& url, |
| 1704 const base::Callback<void(const std::string*)>& callback) { |
| 1705 chrome::Keygen(context, key_size_in_bits, challenge, url, true, callback); |
| 1706 } |
| 1707 |
1698 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { | 1708 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { |
1699 return MediaCaptureDevicesDispatcher::GetInstance(); | 1709 return MediaCaptureDevicesDispatcher::GetInstance(); |
1700 } | 1710 } |
1701 | 1711 |
1702 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( | 1712 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( |
1703 const GURL& source_origin, | 1713 const GURL& source_origin, |
1704 int callback_context, | 1714 int callback_context, |
1705 int render_process_id, | 1715 int render_process_id, |
1706 int render_view_id) { | 1716 int render_view_id) { |
1707 #if defined(ENABLE_NOTIFICATIONS) | 1717 #if defined(ENABLE_NOTIFICATIONS) |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2374 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, | 2384 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, |
2375 sandbox::TargetPolicy::HANDLES_DUP_ANY, | 2385 sandbox::TargetPolicy::HANDLES_DUP_ANY, |
2376 L"File"); | 2386 L"File"); |
2377 if (result != sandbox::SBOX_ALL_OK) { | 2387 if (result != sandbox::SBOX_ALL_OK) { |
2378 *success = false; | 2388 *success = false; |
2379 return; | 2389 return; |
2380 } | 2390 } |
2381 } | 2391 } |
2382 #endif | 2392 #endif |
2383 | 2393 |
2384 #if defined(USE_NSS) | |
2385 crypto::CryptoModuleBlockingPasswordDelegate* | |
2386 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | |
2387 const GURL& url) { | |
2388 return chrome::NewCryptoModuleBlockingDialogDelegate( | |
2389 chrome::kCryptoModulePasswordKeygen, url.host()); | |
2390 } | |
2391 #endif | |
2392 | |
2393 } // namespace chrome | 2394 } // namespace chrome |
OLD | NEW |