| 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #include "chrome/browser/speech/tts_controller.h" | 76 #include "chrome/browser/speech/tts_controller.h" |
| 77 #include "chrome/browser/speech/tts_message_filter.h" | 77 #include "chrome/browser/speech/tts_message_filter.h" |
| 78 #include "chrome/browser/ssl/ssl_add_certificate.h" | 78 #include "chrome/browser/ssl/ssl_add_certificate.h" |
| 79 #include "chrome/browser/ssl/ssl_blocking_page.h" | 79 #include "chrome/browser/ssl/ssl_blocking_page.h" |
| 80 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 80 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
| 81 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 81 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
| 82 #include "chrome/browser/ssl/ssl_error_handler.h" | 82 #include "chrome/browser/ssl/ssl_error_handler.h" |
| 83 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 83 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
| 84 #include "chrome/browser/tab_contents/tab_util.h" | 84 #include "chrome/browser/tab_contents/tab_util.h" |
| 85 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 85 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
| 86 #include "chrome/browser/translate/chrome_translate_client.h" |
| 86 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 87 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
| 87 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 88 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
| 88 #include "chrome/browser/ui/browser_navigator.h" | 89 #include "chrome/browser/ui/browser_navigator.h" |
| 89 #include "chrome/browser/ui/browser_navigator_params.h" | 90 #include "chrome/browser/ui/browser_navigator_params.h" |
| 90 #include "chrome/browser/ui/chrome_select_file_policy.h" | 91 #include "chrome/browser/ui/chrome_select_file_policy.h" |
| 91 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 92 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
| 92 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 93 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
| 93 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 94 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 94 #include "chrome/browser/ui/webui/log_web_ui_url.h" | 95 #include "chrome/browser/ui/webui/log_web_ui_url.h" |
| 95 #include "chrome/browser/usb/usb_tab_helper.h" | 96 #include "chrome/browser/usb/usb_tab_helper.h" |
| (...skipping 2731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2827 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( | 2828 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( |
| 2828 extensions::kExtensionScheme) | 2829 extensions::kExtensionScheme) |
| 2829 #endif | 2830 #endif |
| 2830 ) { | 2831 ) { |
| 2831 registry->AddInterface( | 2832 registry->AddInterface( |
| 2832 base::Bind(&CreateUsbDeviceManager, render_frame_host)); | 2833 base::Bind(&CreateUsbDeviceManager, render_frame_host)); |
| 2833 registry->AddInterface( | 2834 registry->AddInterface( |
| 2834 base::Bind(&CreateWebUsbChooserService, render_frame_host)); | 2835 base::Bind(&CreateWebUsbChooserService, render_frame_host)); |
| 2835 } | 2836 } |
| 2836 | 2837 |
| 2837 // Register mojo CredentialManager service only for main frame. | |
| 2838 if (!render_frame_host->GetParent()) { | 2838 if (!render_frame_host->GetParent()) { |
| 2839 // Register mojo CredentialManager interface only for main frame. |
| 2839 registry->AddInterface( | 2840 registry->AddInterface( |
| 2840 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, | 2841 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, |
| 2841 render_frame_host)); | 2842 render_frame_host)); |
| 2843 // Register mojo ContentTranslateDriver interface only for main frame. |
| 2844 registry->AddInterface(base::Bind( |
| 2845 &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host)); |
| 2842 } | 2846 } |
| 2843 | 2847 |
| 2844 registry->AddInterface( | 2848 registry->AddInterface( |
| 2845 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, | 2849 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, |
| 2846 render_frame_host)); | 2850 render_frame_host)); |
| 2847 | 2851 |
| 2848 #if BUILDFLAG(ANDROID_JAVA_UI) | 2852 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 2849 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( | 2853 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( |
| 2850 registry, render_frame_host); | 2854 registry, render_frame_host); |
| 2851 #endif | 2855 #endif |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3065 if (channel <= kMaxDisableEncryptionChannel) { | 3069 if (channel <= kMaxDisableEncryptionChannel) { |
| 3066 static const char* const kWebRtcDevSwitchNames[] = { | 3070 static const char* const kWebRtcDevSwitchNames[] = { |
| 3067 switches::kDisableWebRtcEncryption, | 3071 switches::kDisableWebRtcEncryption, |
| 3068 }; | 3072 }; |
| 3069 to_command_line->CopySwitchesFrom(from_command_line, | 3073 to_command_line->CopySwitchesFrom(from_command_line, |
| 3070 kWebRtcDevSwitchNames, | 3074 kWebRtcDevSwitchNames, |
| 3071 arraysize(kWebRtcDevSwitchNames)); | 3075 arraysize(kWebRtcDevSwitchNames)); |
| 3072 } | 3076 } |
| 3073 } | 3077 } |
| 3074 #endif // defined(ENABLE_WEBRTC) | 3078 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |