| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 #include "chrome/common/env_vars.h" | 101 #include "chrome/common/env_vars.h" |
| 102 #include "chrome/common/features.h" | 102 #include "chrome/common/features.h" |
| 103 #include "chrome/common/logging_chrome.h" | 103 #include "chrome/common/logging_chrome.h" |
| 104 #include "chrome/common/pepper_permission_util.h" | 104 #include "chrome/common/pepper_permission_util.h" |
| 105 #include "chrome/common/pref_names.h" | 105 #include "chrome/common/pref_names.h" |
| 106 #include "chrome/common/render_messages.h" | 106 #include "chrome/common/render_messages.h" |
| 107 #include "chrome/common/url_constants.h" | 107 #include "chrome/common/url_constants.h" |
| 108 #include "chrome/grit/generated_resources.h" | 108 #include "chrome/grit/generated_resources.h" |
| 109 #include "chrome/installer/util/google_update_settings.h" | 109 #include "chrome/installer/util/google_update_settings.h" |
| 110 #include "chromeos/chromeos_constants.h" | 110 #include "chromeos/chromeos_constants.h" |
| 111 #include "components/autofill/content/browser/content_autofill_driver_factory.h" |
| 111 #include "components/autofill/core/common/autofill_switches.h" | 112 #include "components/autofill/core/common/autofill_switches.h" |
| 112 #include "components/cdm/browser/cdm_message_filter_android.h" | 113 #include "components/cdm/browser/cdm_message_filter_android.h" |
| 113 #include "components/cloud_devices/common/cloud_devices_switches.h" | 114 #include "components/cloud_devices/common/cloud_devices_switches.h" |
| 114 #include "components/content_settings/core/browser/content_settings_utils.h" | 115 #include "components/content_settings/core/browser/content_settings_utils.h" |
| 115 #include "components/content_settings/core/browser/cookie_settings.h" | 116 #include "components/content_settings/core/browser/cookie_settings.h" |
| 116 #include "components/content_settings/core/browser/host_content_settings_map.h" | 117 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 117 #include "components/content_settings/core/common/content_settings.h" | 118 #include "components/content_settings/core/common/content_settings.h" |
| 118 #include "components/content_settings/core/common/content_settings_types.h" | 119 #include "components/content_settings/core/common/content_settings_types.h" |
| 119 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" | 120 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" |
| 120 #include "components/dom_distiller/core/dom_distiller_switches.h" | 121 #include "components/dom_distiller/core/dom_distiller_switches.h" |
| (...skipping 2676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2797 base::Bind(&CreateWebUsbChooserService, render_frame_host)); | 2798 base::Bind(&CreateWebUsbChooserService, render_frame_host)); |
| 2798 } | 2799 } |
| 2799 | 2800 |
| 2800 // Register mojo CredentialManager service only for main frame. | 2801 // Register mojo CredentialManager service only for main frame. |
| 2801 if (!render_frame_host->GetParent()) { | 2802 if (!render_frame_host->GetParent()) { |
| 2802 registry->AddService( | 2803 registry->AddService( |
| 2803 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, | 2804 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, |
| 2804 render_frame_host)); | 2805 render_frame_host)); |
| 2805 } | 2806 } |
| 2806 | 2807 |
| 2808 registry->AddService( |
| 2809 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, |
| 2810 render_frame_host)); |
| 2811 |
| 2807 #if BUILDFLAG(ANDROID_JAVA_UI) | 2812 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 2808 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( | 2813 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( |
| 2809 registry, render_frame_host); | 2814 registry, render_frame_host); |
| 2810 #endif | 2815 #endif |
| 2811 } | 2816 } |
| 2812 | 2817 |
| 2813 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 2818 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
| 2814 StaticMojoApplicationMap* apps) { | 2819 StaticMojoApplicationMap* apps) { |
| 2815 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 2820 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 2816 content::MojoApplicationInfo app_info; | 2821 content::MojoApplicationInfo app_info; |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2989 if (channel <= kMaxDisableEncryptionChannel) { | 2994 if (channel <= kMaxDisableEncryptionChannel) { |
| 2990 static const char* const kWebRtcDevSwitchNames[] = { | 2995 static const char* const kWebRtcDevSwitchNames[] = { |
| 2991 switches::kDisableWebRtcEncryption, | 2996 switches::kDisableWebRtcEncryption, |
| 2992 }; | 2997 }; |
| 2993 to_command_line->CopySwitchesFrom(from_command_line, | 2998 to_command_line->CopySwitchesFrom(from_command_line, |
| 2994 kWebRtcDevSwitchNames, | 2999 kWebRtcDevSwitchNames, |
| 2995 arraysize(kWebRtcDevSwitchNames)); | 3000 arraysize(kWebRtcDevSwitchNames)); |
| 2996 } | 3001 } |
| 2997 } | 3002 } |
| 2998 #endif // defined(ENABLE_WEBRTC) | 3003 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |