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 16 matching lines...) Expand all Loading... |
27 #include "chrome/browser/character_encoding.h" | 27 #include "chrome/browser/character_encoding.h" |
28 #include "chrome/browser/chrome_content_browser_client_parts.h" | 28 #include "chrome/browser/chrome_content_browser_client_parts.h" |
29 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" | 29 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" |
30 #include "chrome/browser/chrome_quota_permission_context.h" | 30 #include "chrome/browser/chrome_quota_permission_context.h" |
31 #include "chrome/browser/content_settings/cookie_settings.h" | 31 #include "chrome/browser/content_settings/cookie_settings.h" |
32 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 32 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
33 #include "chrome/browser/defaults.h" | 33 #include "chrome/browser/defaults.h" |
34 #include "chrome/browser/download/download_prefs.h" | 34 #include "chrome/browser/download/download_prefs.h" |
35 #include "chrome/browser/font_family_cache.h" | 35 #include "chrome/browser/font_family_cache.h" |
36 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 36 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
37 #include "chrome/browser/geolocation/geolocation_permission_context.h" | |
38 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" | |
39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 37 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
40 #include "chrome/browser/media/midi_permission_context.h" | |
41 #include "chrome/browser/media/midi_permission_context_factory.h" | |
42 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 38 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
43 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 39 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
44 #include "chrome/browser/net/chrome_net_log.h" | 40 #include "chrome/browser/net/chrome_net_log.h" |
45 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 41 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
46 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" | 42 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" |
47 #include "chrome/browser/notifications/desktop_notification_service.h" | 43 #include "chrome/browser/notifications/desktop_notification_service.h" |
48 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 44 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
49 #include "chrome/browser/notifications/platform_notification_service_impl.h" | 45 #include "chrome/browser/notifications/platform_notification_service_impl.h" |
50 #include "chrome/browser/platform_util.h" | 46 #include "chrome/browser/platform_util.h" |
51 #include "chrome/browser/prerender/prerender_final_status.h" | 47 #include "chrome/browser/prerender/prerender_final_status.h" |
52 #include "chrome/browser/prerender/prerender_manager.h" | 48 #include "chrome/browser/prerender/prerender_manager.h" |
53 #include "chrome/browser/prerender/prerender_manager_factory.h" | 49 #include "chrome/browser/prerender/prerender_manager_factory.h" |
54 #include "chrome/browser/prerender/prerender_message_filter.h" | 50 #include "chrome/browser/prerender/prerender_message_filter.h" |
55 #include "chrome/browser/printing/printing_message_filter.h" | 51 #include "chrome/browser/printing/printing_message_filter.h" |
56 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" | 52 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
57 #include "chrome/browser/profiles/profile.h" | 53 #include "chrome/browser/profiles/profile.h" |
58 #include "chrome/browser/profiles/profile_io_data.h" | 54 #include "chrome/browser/profiles/profile_io_data.h" |
59 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" | |
60 #include "chrome/browser/push_messaging/push_messaging_permission_context_factor
y.h" | |
61 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 55 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
62 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 56 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
63 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 57 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
64 #include "chrome/browser/search/instant_service.h" | 58 #include "chrome/browser/search/instant_service.h" |
65 #include "chrome/browser/search/instant_service_factory.h" | 59 #include "chrome/browser/search/instant_service_factory.h" |
66 #include "chrome/browser/search/search.h" | 60 #include "chrome/browser/search/search.h" |
67 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" | 61 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" |
68 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 62 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
69 #include "chrome/browser/speech/tts_controller.h" | 63 #include "chrome/browser/speech/tts_controller.h" |
70 #include "chrome/browser/speech/tts_message_filter.h" | 64 #include "chrome/browser/speech/tts_message_filter.h" |
(...skipping 17 matching lines...) Expand all Loading... |
88 #include "chrome/common/logging_chrome.h" | 82 #include "chrome/common/logging_chrome.h" |
89 #include "chrome/common/pepper_permission_util.h" | 83 #include "chrome/common/pepper_permission_util.h" |
90 #include "chrome/common/pref_names.h" | 84 #include "chrome/common/pref_names.h" |
91 #include "chrome/common/render_messages.h" | 85 #include "chrome/common/render_messages.h" |
92 #include "chrome/common/url_constants.h" | 86 #include "chrome/common/url_constants.h" |
93 #include "chrome/grit/generated_resources.h" | 87 #include "chrome/grit/generated_resources.h" |
94 #include "chrome/installer/util/google_update_settings.h" | 88 #include "chrome/installer/util/google_update_settings.h" |
95 #include "chromeos/chromeos_constants.h" | 89 #include "chromeos/chromeos_constants.h" |
96 #include "components/cdm/browser/cdm_message_filter_android.h" | 90 #include "components/cdm/browser/cdm_message_filter_android.h" |
97 #include "components/cloud_devices/common/cloud_devices_switches.h" | 91 #include "components/cloud_devices/common/cloud_devices_switches.h" |
98 #include "components/content_settings/core/browser/content_settings_provider.h" | |
99 #include "components/content_settings/core/browser/content_settings_utils.h" | 92 #include "components/content_settings/core/browser/content_settings_utils.h" |
100 #include "components/content_settings/core/browser/host_content_settings_map.h" | 93 #include "components/content_settings/core/browser/host_content_settings_map.h" |
101 #include "components/content_settings/core/common/content_settings.h" | 94 #include "components/content_settings/core/common/content_settings.h" |
102 #include "components/content_settings/core/common/permission_request_id.h" | |
103 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" | 95 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" |
104 #include "components/dom_distiller/core/url_constants.h" | 96 #include "components/dom_distiller/core/url_constants.h" |
105 #include "components/google/core/browser/google_util.h" | 97 #include "components/google/core/browser/google_util.h" |
106 #include "components/metrics/client_info.h" | 98 #include "components/metrics/client_info.h" |
107 #include "components/pref_registry/pref_registry_syncable.h" | 99 #include "components/pref_registry/pref_registry_syncable.h" |
108 #include "components/rappor/rappor_utils.h" | 100 #include "components/rappor/rappor_utils.h" |
109 #include "components/signin/core/common/profile_management_switches.h" | 101 #include "components/signin/core/common/profile_management_switches.h" |
110 #include "components/translate/core/common/translate_switches.h" | 102 #include "components/translate/core/common/translate_switches.h" |
111 #include "components/url_fixer/url_fixer.h" | 103 #include "components/url_fixer/url_fixer.h" |
112 #include "content/public/browser/browser_child_process_host.h" | 104 #include "content/public/browser/browser_child_process_host.h" |
113 #include "content/public/browser/browser_main_parts.h" | 105 #include "content/public/browser/browser_main_parts.h" |
114 #include "content/public/browser/browser_ppapi_host.h" | 106 #include "content/public/browser/browser_ppapi_host.h" |
115 #include "content/public/browser/browser_thread.h" | 107 #include "content/public/browser/browser_thread.h" |
116 #include "content/public/browser/browser_url_handler.h" | 108 #include "content/public/browser/browser_url_handler.h" |
117 #include "content/public/browser/child_process_data.h" | 109 #include "content/public/browser/child_process_data.h" |
118 #include "content/public/browser/child_process_security_policy.h" | 110 #include "content/public/browser/child_process_security_policy.h" |
119 #include "content/public/browser/client_certificate_delegate.h" | 111 #include "content/public/browser/client_certificate_delegate.h" |
120 #include "content/public/browser/permission_type.h" | |
121 #include "content/public/browser/render_frame_host.h" | 112 #include "content/public/browser/render_frame_host.h" |
122 #include "content/public/browser/render_process_host.h" | 113 #include "content/public/browser/render_process_host.h" |
123 #include "content/public/browser/render_view_host.h" | 114 #include "content/public/browser/render_view_host.h" |
124 #include "content/public/browser/resource_context.h" | 115 #include "content/public/browser/resource_context.h" |
125 #include "content/public/browser/site_instance.h" | 116 #include "content/public/browser/site_instance.h" |
126 #include "content/public/browser/web_contents.h" | 117 #include "content/public/browser/web_contents.h" |
127 #include "content/public/common/child_process_host.h" | 118 #include "content/public/common/child_process_host.h" |
128 #include "content/public/common/content_descriptors.h" | 119 #include "content/public/common/content_descriptors.h" |
129 #include "content/public/common/url_utils.h" | 120 #include "content/public/common/url_utils.h" |
130 #include "content/public/common/web_preferences.h" | 121 #include "content/public/common/web_preferences.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 #include "chrome/browser/android/new_tab_page_url_handler.h" | 155 #include "chrome/browser/android/new_tab_page_url_handler.h" |
165 #include "chrome/browser/android/service_tab_launcher.h" | 156 #include "chrome/browser/android/service_tab_launcher.h" |
166 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" | 157 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" |
167 #include "chrome/browser/chrome_browser_main_android.h" | 158 #include "chrome/browser/chrome_browser_main_android.h" |
168 #include "chrome/common/descriptors_android.h" | 159 #include "chrome/common/descriptors_android.h" |
169 #include "components/crash/browser/crash_dump_manager_android.h" | 160 #include "components/crash/browser/crash_dump_manager_android.h" |
170 #elif defined(OS_POSIX) | 161 #elif defined(OS_POSIX) |
171 #include "chrome/browser/chrome_browser_main_posix.h" | 162 #include "chrome/browser/chrome_browser_main_posix.h" |
172 #endif | 163 #endif |
173 | 164 |
174 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | |
175 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | |
176 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" | |
177 #endif | |
178 | |
179 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 165 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
180 #include "base/debug/leak_annotations.h" | 166 #include "base/debug/leak_annotations.h" |
181 #include "components/crash/app/breakpad_linux.h" | 167 #include "components/crash/app/breakpad_linux.h" |
182 #include "components/crash/browser/crash_handler_host_linux.h" | 168 #include "components/crash/browser/crash_handler_host_linux.h" |
183 #endif | 169 #endif |
184 | 170 |
185 #if defined(OS_ANDROID) | 171 #if defined(OS_ANDROID) |
186 #include "ui/base/ui_base_paths.h" | 172 #include "ui/base/ui_base_paths.h" |
187 #include "ui/gfx/android/device_display_info.h" | 173 #include "ui/gfx/android/device_display_info.h" |
188 #endif | 174 #endif |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 | 568 |
583 rules->script_rules.push_back( | 569 rules->script_rules.push_back( |
584 ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), | 570 ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
585 ContentSettingsPattern::Wildcard(), | 571 ContentSettingsPattern::Wildcard(), |
586 CONTENT_SETTING_ALLOW, | 572 CONTENT_SETTING_ALLOW, |
587 std::string(), | 573 std::string(), |
588 incognito)); | 574 incognito)); |
589 } | 575 } |
590 #endif // defined(ENALBE_EXTENSIONS) | 576 #endif // defined(ENALBE_EXTENSIONS) |
591 | 577 |
592 content::PermissionStatus | |
593 ContentSettingToPermissionStatus(ContentSetting setting) { | |
594 switch (setting) { | |
595 case CONTENT_SETTING_ALLOW: | |
596 case CONTENT_SETTING_SESSION_ONLY: | |
597 return content::PERMISSION_STATUS_GRANTED; | |
598 case CONTENT_SETTING_BLOCK: | |
599 return content::PERMISSION_STATUS_DENIED; | |
600 case CONTENT_SETTING_ASK: | |
601 return content::PERMISSION_STATUS_ASK; | |
602 case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT: | |
603 case CONTENT_SETTING_DEFAULT: | |
604 case CONTENT_SETTING_NUM_SETTINGS: | |
605 break; | |
606 } | |
607 NOTREACHED(); | |
608 return content::PERMISSION_STATUS_DENIED; | |
609 } | |
610 | |
611 PermissionContextBase* GetPermissionContext(Profile* profile, | |
612 content::PermissionType permission) { | |
613 switch (permission) { | |
614 case content::PermissionType::MIDI_SYSEX: | |
615 return MidiPermissionContextFactory::GetForProfile(profile); | |
616 case content::PermissionType::NOTIFICATIONS: | |
617 #if defined(ENABLE_NOTIFICATIONS) | |
618 return DesktopNotificationServiceFactory::GetForProfile(profile); | |
619 #else | |
620 NOTIMPLEMENTED(); | |
621 break; | |
622 #endif | |
623 case content::PermissionType::GEOLOCATION: | |
624 return GeolocationPermissionContextFactory::GetForProfile(profile); | |
625 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | |
626 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | |
627 return ProtectedMediaIdentifierPermissionContextFactory::GetForProfile( | |
628 profile); | |
629 #else | |
630 NOTIMPLEMENTED(); | |
631 break; | |
632 #endif | |
633 case content::PermissionType::PUSH_MESSAGING: | |
634 return PushMessagingPermissionContextFactory::GetForProfile(profile); | |
635 case content::PermissionType::NUM: | |
636 NOTREACHED() << "Invalid RequestPermission for " | |
637 << static_cast<int>(permission); | |
638 break; | |
639 } | |
640 return nullptr; | |
641 } | |
642 | |
643 // Helper method to translate from Permissions to ContentSettings | |
644 ContentSettingsType PermissionToContentSetting( | |
645 content::PermissionType permission) { | |
646 switch (permission) { | |
647 case content::PermissionType::MIDI_SYSEX: | |
648 return CONTENT_SETTINGS_TYPE_MIDI_SYSEX; | |
649 case content::PermissionType::PUSH_MESSAGING: | |
650 return CONTENT_SETTINGS_TYPE_PUSH_MESSAGING; | |
651 case content::PermissionType::NOTIFICATIONS: | |
652 return CONTENT_SETTINGS_TYPE_NOTIFICATIONS; | |
653 case content::PermissionType::GEOLOCATION: | |
654 return CONTENT_SETTINGS_TYPE_GEOLOCATION; | |
655 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | |
656 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | |
657 return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER; | |
658 #endif | |
659 default: | |
660 NOTREACHED() << "Unknown content setting for permission " | |
661 << static_cast<int>(permission); | |
662 return CONTENT_SETTINGS_TYPE_DEFAULT; | |
663 } | |
664 } | |
665 | |
666 void OnRequestPermission( | |
667 const base::Callback<void(content::PermissionStatus)>& callback, | |
668 ContentSetting content_setting) { | |
669 callback.Run(ContentSettingToPermissionStatus(content_setting)); | |
670 } | |
671 | |
672 } // namespace | 578 } // namespace |
673 | 579 |
674 namespace chrome { | 580 namespace chrome { |
675 | 581 |
676 ChromeContentBrowserClient::ChromeContentBrowserClient() | 582 ChromeContentBrowserClient::ChromeContentBrowserClient() |
677 : | 583 : |
678 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 584 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
679 v8_natives_fd_(-1), | 585 v8_natives_fd_(-1), |
680 v8_snapshot_fd_(-1), | 586 v8_snapshot_fd_(-1), |
681 #endif // OS_POSIX && !OS_MACOSX | 587 #endif // OS_POSIX && !OS_MACOSX |
(...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1881 content::PlatformNotificationService* | 1787 content::PlatformNotificationService* |
1882 ChromeContentBrowserClient::GetPlatformNotificationService() { | 1788 ChromeContentBrowserClient::GetPlatformNotificationService() { |
1883 #if defined(ENABLE_NOTIFICATIONS) | 1789 #if defined(ENABLE_NOTIFICATIONS) |
1884 return PlatformNotificationServiceImpl::GetInstance(); | 1790 return PlatformNotificationServiceImpl::GetInstance(); |
1885 #else | 1791 #else |
1886 NOTIMPLEMENTED(); | 1792 NOTIMPLEMENTED(); |
1887 return NULL; | 1793 return NULL; |
1888 #endif | 1794 #endif |
1889 } | 1795 } |
1890 | 1796 |
1891 void ChromeContentBrowserClient::RequestPermission( | |
1892 content::PermissionType permission, | |
1893 content::WebContents* web_contents, | |
1894 int bridge_id, | |
1895 const GURL& requesting_frame, | |
1896 bool user_gesture, | |
1897 const base::Callback<void(content::PermissionStatus)>& result_callback) { | |
1898 int render_process_id = web_contents->GetRenderProcessHost()->GetID(); | |
1899 int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID(); | |
1900 const PermissionRequestID request_id(render_process_id, | |
1901 render_view_id, | |
1902 bridge_id, | |
1903 requesting_frame); | |
1904 Profile* profile = | |
1905 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | |
1906 PermissionContextBase* context = GetPermissionContext(profile, permission); | |
1907 | |
1908 if (!context) | |
1909 return; | |
1910 | |
1911 context->RequestPermission(web_contents, request_id, requesting_frame, | |
1912 user_gesture, | |
1913 base::Bind(&OnRequestPermission, result_callback)); | |
1914 } | |
1915 | |
1916 content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus( | |
1917 content::PermissionType permission, | |
1918 content::BrowserContext* browser_context, | |
1919 const GURL& requesting_origin, | |
1920 const GURL& embedding_origin) { | |
1921 DCHECK(browser_context); | |
1922 Profile* profile = Profile::FromBrowserContext(browser_context); | |
1923 PermissionContextBase* context = GetPermissionContext(profile, permission); | |
1924 | |
1925 if (!context) | |
1926 return content::PERMISSION_STATUS_ASK; | |
1927 | |
1928 return ContentSettingToPermissionStatus( | |
1929 context->GetPermissionStatus(requesting_origin.GetOrigin(), | |
1930 embedding_origin.GetOrigin())); | |
1931 } | |
1932 | |
1933 void ChromeContentBrowserClient::ResetPermission( | |
1934 content::PermissionType permission, | |
1935 content::BrowserContext* browser_context, | |
1936 const GURL& requesting_origin, | |
1937 const GURL& embedding_origin) { | |
1938 DCHECK(browser_context); | |
1939 Profile* profile = Profile::FromBrowserContext(browser_context); | |
1940 PermissionContextBase* context = GetPermissionContext(profile, permission); | |
1941 | |
1942 if (!context) | |
1943 return; | |
1944 | |
1945 context->ResetPermission(requesting_origin.GetOrigin(), | |
1946 embedding_origin.GetOrigin()); | |
1947 } | |
1948 | |
1949 void ChromeContentBrowserClient::CancelPermissionRequest( | |
1950 content::PermissionType permission, | |
1951 content::WebContents* web_contents, | |
1952 int bridge_id, | |
1953 const GURL& requesting_frame) { | |
1954 int render_process_id = web_contents->GetRenderProcessHost()->GetID(); | |
1955 int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID(); | |
1956 const PermissionRequestID request_id(render_process_id, | |
1957 render_view_id, | |
1958 bridge_id, | |
1959 requesting_frame); | |
1960 Profile* profile = | |
1961 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | |
1962 PermissionContextBase* context = GetPermissionContext(profile, permission); | |
1963 if (!context) | |
1964 return; | |
1965 context->CancelPermissionRequest(web_contents, request_id); | |
1966 } | |
1967 | |
1968 void ChromeContentBrowserClient::RegisterPermissionUsage( | |
1969 content::PermissionType permission, | |
1970 content::WebContents* web_contents, | |
1971 const GURL& frame_url, | |
1972 const GURL& main_frame_url) { | |
1973 Profile::FromBrowserContext(web_contents->GetBrowserContext()) | |
1974 ->GetHostContentSettingsMap() | |
1975 ->UpdateLastUsage( | |
1976 frame_url, main_frame_url, PermissionToContentSetting(permission)); | |
1977 } | |
1978 | |
1979 bool ChromeContentBrowserClient::CanCreateWindow( | 1797 bool ChromeContentBrowserClient::CanCreateWindow( |
1980 const GURL& opener_url, | 1798 const GURL& opener_url, |
1981 const GURL& opener_top_level_frame_url, | 1799 const GURL& opener_top_level_frame_url, |
1982 const GURL& source_origin, | 1800 const GURL& source_origin, |
1983 WindowContainerType container_type, | 1801 WindowContainerType container_type, |
1984 const GURL& target_url, | 1802 const GURL& target_url, |
1985 const content::Referrer& referrer, | 1803 const content::Referrer& referrer, |
1986 WindowOpenDisposition disposition, | 1804 WindowOpenDisposition disposition, |
1987 const WebWindowFeatures& features, | 1805 const WebWindowFeatures& features, |
1988 bool user_gesture, | 1806 bool user_gesture, |
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2596 switches::kDisableWebRtcEncryption, | 2414 switches::kDisableWebRtcEncryption, |
2597 }; | 2415 }; |
2598 to_command_line->CopySwitchesFrom(from_command_line, | 2416 to_command_line->CopySwitchesFrom(from_command_line, |
2599 kWebRtcDevSwitchNames, | 2417 kWebRtcDevSwitchNames, |
2600 arraysize(kWebRtcDevSwitchNames)); | 2418 arraysize(kWebRtcDevSwitchNames)); |
2601 } | 2419 } |
2602 } | 2420 } |
2603 #endif // defined(ENABLE_WEBRTC) | 2421 #endif // defined(ENABLE_WEBRTC) |
2604 | 2422 |
2605 } // namespace chrome | 2423 } // namespace chrome |
OLD | NEW |