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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
71 #include "chrome/browser/ssl/ssl_error_handler.h" | 71 #include "chrome/browser/ssl/ssl_error_handler.h" |
72 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 72 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
73 #include "chrome/browser/tab_contents/tab_util.h" | 73 #include "chrome/browser/tab_contents/tab_util.h" |
74 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 74 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
75 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 75 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
76 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 76 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
77 #include "chrome/browser/ui/chrome_select_file_policy.h" | 77 #include "chrome/browser/ui/chrome_select_file_policy.h" |
78 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 78 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
79 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 79 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
80 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 80 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
81 #include "chrome/common/application_urls.h" | |
81 #include "chrome/common/chrome_constants.h" | 82 #include "chrome/common/chrome_constants.h" |
82 #include "chrome/common/chrome_paths.h" | 83 #include "chrome/common/chrome_paths.h" |
83 #include "chrome/common/chrome_switches.h" | 84 #include "chrome/common/chrome_switches.h" |
84 #include "chrome/common/env_vars.h" | 85 #include "chrome/common/env_vars.h" |
85 #include "chrome/common/logging_chrome.h" | 86 #include "chrome/common/logging_chrome.h" |
86 #include "chrome/common/pepper_permission_util.h" | 87 #include "chrome/common/pepper_permission_util.h" |
87 #include "chrome/common/pref_names.h" | 88 #include "chrome/common/pref_names.h" |
88 #include "chrome/common/render_messages.h" | 89 #include "chrome/common/render_messages.h" |
89 #include "chrome/common/url_constants.h" | 90 #include "chrome/common/url_constants.h" |
90 #include "chrome/grit/generated_resources.h" | 91 #include "chrome/grit/generated_resources.h" |
91 #include "chrome/installer/util/google_update_settings.h" | 92 #include "chrome/installer/util/google_update_settings.h" |
92 #include "chromeos/chromeos_constants.h" | 93 #include "chromeos/chromeos_constants.h" |
93 #include "components/cdm/browser/cdm_message_filter_android.h" | 94 #include "components/cdm/browser/cdm_message_filter_android.h" |
94 #include "components/cloud_devices/common/cloud_devices_switches.h" | 95 #include "components/cloud_devices/common/cloud_devices_switches.h" |
95 #include "components/content_settings/core/browser/content_settings_utils.h" | 96 #include "components/content_settings/core/browser/content_settings_utils.h" |
96 #include "components/content_settings/core/browser/host_content_settings_map.h" | 97 #include "components/content_settings/core/browser/host_content_settings_map.h" |
97 #include "components/content_settings/core/common/content_settings.h" | 98 #include "components/content_settings/core/common/content_settings.h" |
98 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h" | 99 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m essage_filter.h" |
99 #include "components/dom_distiller/core/url_constants.h" | 100 #include "components/dom_distiller/core/url_constants.h" |
100 #include "components/google/core/browser/google_util.h" | 101 #include "components/google/core/browser/google_util.h" |
101 #include "components/metrics/client_info.h" | 102 #include "components/metrics/client_info.h" |
102 #include "components/pref_registry/pref_registry_syncable.h" | 103 #include "components/pref_registry/pref_registry_syncable.h" |
104 #include "components/proxy_resolver/proxy_resolver_app.h" | |
103 #include "components/rappor/rappor_utils.h" | 105 #include "components/rappor/rappor_utils.h" |
104 #include "components/signin/core/common/profile_management_switches.h" | 106 #include "components/signin/core/common/profile_management_switches.h" |
105 #include "components/translate/core/common/translate_switches.h" | 107 #include "components/translate/core/common/translate_switches.h" |
106 #include "components/url_fixer/url_fixer.h" | 108 #include "components/url_fixer/url_fixer.h" |
107 #include "content/public/browser/browser_child_process_host.h" | 109 #include "content/public/browser/browser_child_process_host.h" |
108 #include "content/public/browser/browser_main_parts.h" | 110 #include "content/public/browser/browser_main_parts.h" |
109 #include "content/public/browser/browser_ppapi_host.h" | 111 #include "content/public/browser/browser_ppapi_host.h" |
110 #include "content/public/browser/browser_thread.h" | 112 #include "content/public/browser/browser_thread.h" |
111 #include "content/public/browser/browser_url_handler.h" | 113 #include "content/public/browser/browser_url_handler.h" |
112 #include "content/public/browser/child_process_data.h" | 114 #include "content/public/browser/child_process_data.h" |
113 #include "content/public/browser/child_process_security_policy.h" | 115 #include "content/public/browser/child_process_security_policy.h" |
114 #include "content/public/browser/client_certificate_delegate.h" | 116 #include "content/public/browser/client_certificate_delegate.h" |
117 #include "content/public/browser/mojo_shell_context.h" | |
115 #include "content/public/browser/render_frame_host.h" | 118 #include "content/public/browser/render_frame_host.h" |
116 #include "content/public/browser/render_process_host.h" | 119 #include "content/public/browser/render_process_host.h" |
117 #include "content/public/browser/render_view_host.h" | 120 #include "content/public/browser/render_view_host.h" |
118 #include "content/public/browser/resource_context.h" | 121 #include "content/public/browser/resource_context.h" |
119 #include "content/public/browser/site_instance.h" | 122 #include "content/public/browser/site_instance.h" |
120 #include "content/public/browser/web_contents.h" | 123 #include "content/public/browser/web_contents.h" |
121 #include "content/public/common/child_process_host.h" | 124 #include "content/public/common/child_process_host.h" |
122 #include "content/public/common/content_descriptors.h" | 125 #include "content/public/common/content_descriptors.h" |
123 #include "content/public/common/url_utils.h" | 126 #include "content/public/common/url_utils.h" |
124 #include "content/public/common/web_preferences.h" | 127 #include "content/public/common/web_preferences.h" |
125 #include "gin/v8_initializer.h" | 128 #include "gin/v8_initializer.h" |
126 #include "net/base/mime_util.h" | 129 #include "net/base/mime_util.h" |
127 #include "net/cookies/canonical_cookie.h" | 130 #include "net/cookies/canonical_cookie.h" |
128 #include "net/cookies/cookie_options.h" | 131 #include "net/cookies/cookie_options.h" |
129 #include "net/ssl/ssl_cert_request_info.h" | 132 #include "net/ssl/ssl_cert_request_info.h" |
130 #include "ppapi/host/ppapi_host.h" | 133 #include "ppapi/host/ppapi_host.h" |
131 #include "storage/browser/fileapi/external_mount_points.h" | 134 #include "storage/browser/fileapi/external_mount_points.h" |
132 #include "ui/base/l10n/l10n_util.h" | 135 #include "ui/base/l10n/l10n_util.h" |
133 #include "ui/base/resource/resource_bundle.h" | 136 #include "ui/base/resource/resource_bundle.h" |
134 #include "ui/resources/grit/ui_resources.h" | 137 #include "ui/resources/grit/ui_resources.h" |
138 #include "url/gurl.h" | |
135 | 139 |
136 #if defined(OS_WIN) | 140 #if defined(OS_WIN) |
137 #include "base/win/windows_version.h" | 141 #include "base/win/windows_version.h" |
138 #include "chrome/browser/chrome_browser_main_win.h" | 142 #include "chrome/browser/chrome_browser_main_win.h" |
139 #include "sandbox/win/src/sandbox_policy.h" | 143 #include "sandbox/win/src/sandbox_policy.h" |
140 #elif defined(OS_MACOSX) | 144 #elif defined(OS_MACOSX) |
141 #include "chrome/browser/chrome_browser_main_mac.h" | 145 #include "chrome/browser/chrome_browser_main_mac.h" |
142 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" | 146 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" |
143 #elif defined(OS_CHROMEOS) | 147 #elif defined(OS_CHROMEOS) |
144 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 148 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
(...skipping 2299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2444 static const char* const kWebRtcDevSwitchNames[] = { | 2448 static const char* const kWebRtcDevSwitchNames[] = { |
2445 switches::kDisableWebRtcEncryption, | 2449 switches::kDisableWebRtcEncryption, |
2446 }; | 2450 }; |
2447 to_command_line->CopySwitchesFrom(from_command_line, | 2451 to_command_line->CopySwitchesFrom(from_command_line, |
2448 kWebRtcDevSwitchNames, | 2452 kWebRtcDevSwitchNames, |
2449 arraysize(kWebRtcDevSwitchNames)); | 2453 arraysize(kWebRtcDevSwitchNames)); |
2450 } | 2454 } |
2451 } | 2455 } |
2452 #endif // defined(ENABLE_WEBRTC) | 2456 #endif // defined(ENABLE_WEBRTC) |
2453 | 2457 |
2458 void ChromeContentBrowserClient::ConfigureMojoShell( | |
2459 content::MojoShellContext* context) { | |
2460 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
2461 switches::kV8PacMojoInProcess)) { | |
xhwang
2015/05/13 04:36:20
For media, I am using a gyp/gn variable and a macr
| |
2462 context->AddInProcessStaticLoader<proxy_resolver::ProxyResolverApp>( | |
2463 GURL(application_urls::kProxyResolver)); | |
2464 } | |
2465 } | |
2466 | |
2454 } // namespace chrome | 2467 } // namespace chrome |
OLD | NEW |