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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 #include "chrome/browser/ssl/ssl_error_handler.h" | 74 #include "chrome/browser/ssl/ssl_error_handler.h" |
75 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 75 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
76 #include "chrome/browser/tab_contents/tab_util.h" | 76 #include "chrome/browser/tab_contents/tab_util.h" |
77 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 77 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
78 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 78 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
79 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 79 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
80 #include "chrome/browser/ui/chrome_select_file_policy.h" | 80 #include "chrome/browser/ui/chrome_select_file_policy.h" |
81 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 81 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
82 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 82 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
83 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 83 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 84 #include "chrome/common/channel_info.h" |
84 #include "chrome/common/chrome_constants.h" | 85 #include "chrome/common/chrome_constants.h" |
85 #include "chrome/common/chrome_paths.h" | 86 #include "chrome/common/chrome_paths.h" |
86 #include "chrome/common/chrome_switches.h" | 87 #include "chrome/common/chrome_switches.h" |
87 #include "chrome/common/chrome_version_info.h" | |
88 #include "chrome/common/env_vars.h" | 88 #include "chrome/common/env_vars.h" |
89 #include "chrome/common/logging_chrome.h" | 89 #include "chrome/common/logging_chrome.h" |
90 #include "chrome/common/pepper_permission_util.h" | 90 #include "chrome/common/pepper_permission_util.h" |
91 #include "chrome/common/pref_names.h" | 91 #include "chrome/common/pref_names.h" |
92 #include "chrome/common/render_messages.h" | 92 #include "chrome/common/render_messages.h" |
93 #include "chrome/common/url_constants.h" | 93 #include "chrome/common/url_constants.h" |
94 #include "chrome/grit/generated_resources.h" | 94 #include "chrome/grit/generated_resources.h" |
95 #include "chrome/installer/util/google_update_settings.h" | 95 #include "chrome/installer/util/google_update_settings.h" |
96 #include "chromeos/chromeos_constants.h" | 96 #include "chromeos/chromeos_constants.h" |
97 #include "components/cdm/browser/cdm_message_filter_android.h" | 97 #include "components/cdm/browser/cdm_message_filter_android.h" |
98 #include "components/cloud_devices/common/cloud_devices_switches.h" | 98 #include "components/cloud_devices/common/cloud_devices_switches.h" |
99 #include "components/content_settings/core/browser/content_settings_utils.h" | 99 #include "components/content_settings/core/browser/content_settings_utils.h" |
100 #include "components/content_settings/core/browser/cookie_settings.h" | 100 #include "components/content_settings/core/browser/cookie_settings.h" |
101 #include "components/content_settings/core/browser/host_content_settings_map.h" | 101 #include "components/content_settings/core/browser/host_content_settings_map.h" |
102 #include "components/content_settings/core/common/content_settings.h" | 102 #include "components/content_settings/core/common/content_settings.h" |
103 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" | 103 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" |
104 #include "components/dom_distiller/core/url_constants.h" | 104 #include "components/dom_distiller/core/url_constants.h" |
105 #include "components/google/core/browser/google_util.h" | 105 #include "components/google/core/browser/google_util.h" |
106 #include "components/metrics/client_info.h" | 106 #include "components/metrics/client_info.h" |
107 #include "components/pref_registry/pref_registry_syncable.h" | 107 #include "components/pref_registry/pref_registry_syncable.h" |
108 #include "components/rappor/rappor_utils.h" | 108 #include "components/rappor/rappor_utils.h" |
109 #include "components/signin/core/common/profile_management_switches.h" | 109 #include "components/signin/core/common/profile_management_switches.h" |
110 #include "components/translate/core/common/translate_switches.h" | 110 #include "components/translate/core/common/translate_switches.h" |
111 #include "components/url_fixer/url_fixer.h" | 111 #include "components/url_fixer/url_fixer.h" |
112 #include "components/variations/variations_associated_data.h" | 112 #include "components/variations/variations_associated_data.h" |
| 113 #include "components/version_info/version_info.h" |
113 #include "content/public/browser/browser_child_process_host.h" | 114 #include "content/public/browser/browser_child_process_host.h" |
114 #include "content/public/browser/browser_main_parts.h" | 115 #include "content/public/browser/browser_main_parts.h" |
115 #include "content/public/browser/browser_ppapi_host.h" | 116 #include "content/public/browser/browser_ppapi_host.h" |
116 #include "content/public/browser/browser_thread.h" | 117 #include "content/public/browser/browser_thread.h" |
117 #include "content/public/browser/browser_url_handler.h" | 118 #include "content/public/browser/browser_url_handler.h" |
118 #include "content/public/browser/child_process_data.h" | 119 #include "content/public/browser/child_process_data.h" |
119 #include "content/public/browser/child_process_security_policy.h" | 120 #include "content/public/browser/child_process_security_policy.h" |
120 #include "content/public/browser/client_certificate_delegate.h" | 121 #include "content/public/browser/client_certificate_delegate.h" |
121 #include "content/public/browser/render_frame_host.h" | 122 #include "content/public/browser/render_frame_host.h" |
122 #include "content/public/browser/render_process_host.h" | 123 #include "content/public/browser/render_process_host.h" |
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1313 browser_command_line.GetSwitchValueASCII( | 1314 browser_command_line.GetSwitchValueASCII( |
1314 chromeos::switches::kLoginProfile); | 1315 chromeos::switches::kLoginProfile); |
1315 if (!login_profile.empty()) | 1316 if (!login_profile.empty()) |
1316 command_line->AppendSwitchASCII( | 1317 command_line->AppendSwitchASCII( |
1317 chromeos::switches::kLoginProfile, login_profile); | 1318 chromeos::switches::kLoginProfile, login_profile); |
1318 #endif | 1319 #endif |
1319 | 1320 |
1320 #if defined(ENABLE_WEBRTC) | 1321 #if defined(ENABLE_WEBRTC) |
1321 MaybeCopyDisableWebRtcEncryptionSwitch(command_line, | 1322 MaybeCopyDisableWebRtcEncryptionSwitch(command_line, |
1322 browser_command_line, | 1323 browser_command_line, |
1323 VersionInfo::GetChannel()); | 1324 chrome::GetChannel()); |
1324 #endif | 1325 #endif |
1325 | 1326 |
1326 if (process) { | 1327 if (process) { |
1327 PrefService* prefs = profile->GetPrefs(); | 1328 PrefService* prefs = profile->GetPrefs(); |
1328 // Currently this pref is only registered if applied via a policy. | 1329 // Currently this pref is only registered if applied via a policy. |
1329 if (prefs->HasPrefPath(prefs::kDisable3DAPIs) && | 1330 if (prefs->HasPrefPath(prefs::kDisable3DAPIs) && |
1330 prefs->GetBoolean(prefs::kDisable3DAPIs)) { | 1331 prefs->GetBoolean(prefs::kDisable3DAPIs)) { |
1331 // Turn this policy into a command line switch. | 1332 // Turn this policy into a command line switch. |
1332 command_line->AppendSwitch(switches::kDisable3DAPIs); | 1333 command_line->AppendSwitch(switches::kDisable3DAPIs); |
1333 } | 1334 } |
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2351 #if defined(OS_WIN) | 2352 #if defined(OS_WIN) |
2352 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { | 2353 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { |
2353 return chrome::kBrowserResourcesDll; | 2354 return chrome::kBrowserResourcesDll; |
2354 } | 2355 } |
2355 | 2356 |
2356 base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( | 2357 base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( |
2357 int sandbox_type) const { | 2358 int sandbox_type) const { |
2358 base::string16 sid; | 2359 base::string16 sid; |
2359 | 2360 |
2360 #if defined(GOOGLE_CHROME_BUILD) | 2361 #if defined(GOOGLE_CHROME_BUILD) |
2361 const version_info::Channel channel = | 2362 const version_info::Channel channel = chrome::GetChannel(); |
2362 chrome::VersionInfo::GetChannel(); | |
2363 | 2363 |
2364 // It's possible to have a SxS installation running at the same time as a | 2364 // It's possible to have a SxS installation running at the same time as a |
2365 // non-SxS so isolate them from each other. | 2365 // non-SxS so isolate them from each other. |
2366 if (channel == version_info::Channel::CANARY) { | 2366 if (channel == version_info::Channel::CANARY) { |
2367 sid.assign( | 2367 sid.assign( |
2368 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" | 2368 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" |
2369 L"924012150-"); | 2369 L"924012150-"); |
2370 } else { | 2370 } else { |
2371 sid.assign( | 2371 sid.assign( |
2372 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" | 2372 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2564 switches::kDisableWebRtcEncryption, | 2564 switches::kDisableWebRtcEncryption, |
2565 }; | 2565 }; |
2566 to_command_line->CopySwitchesFrom(from_command_line, | 2566 to_command_line->CopySwitchesFrom(from_command_line, |
2567 kWebRtcDevSwitchNames, | 2567 kWebRtcDevSwitchNames, |
2568 arraysize(kWebRtcDevSwitchNames)); | 2568 arraysize(kWebRtcDevSwitchNames)); |
2569 } | 2569 } |
2570 } | 2570 } |
2571 #endif // defined(ENABLE_WEBRTC) | 2571 #endif // defined(ENABLE_WEBRTC) |
2572 | 2572 |
2573 } // namespace chrome | 2573 } // namespace chrome |
OLD | NEW |