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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 #include "chrome/browser/chromeos/login/startup_utils.h" | 156 #include "chrome/browser/chromeos/login/startup_utils.h" |
157 #include "chrome/browser/chromeos/login/user_manager.h" | 157 #include "chrome/browser/chromeos/login/user_manager.h" |
158 #include "chrome/browser/chromeos/system/input_device_settings.h" | 158 #include "chrome/browser/chromeos/system/input_device_settings.h" |
159 #include "chromeos/chromeos_switches.h" | 159 #include "chromeos/chromeos_switches.h" |
160 #elif defined(OS_LINUX) | 160 #elif defined(OS_LINUX) |
161 #include "chrome/browser/chrome_browser_main_linux.h" | 161 #include "chrome/browser/chrome_browser_main_linux.h" |
162 #elif defined(OS_ANDROID) | 162 #elif defined(OS_ANDROID) |
163 #include "chrome/browser/android/crash_dump_manager.h" | 163 #include "chrome/browser/android/crash_dump_manager.h" |
164 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" | 164 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" |
165 #include "chrome/browser/chrome_browser_main_android.h" | 165 #include "chrome/browser/chrome_browser_main_android.h" |
| 166 #include "chrome/browser/media/encrypted_media_message_filter_android.h" |
166 #include "chrome/common/descriptors_android.h" | 167 #include "chrome/common/descriptors_android.h" |
167 #elif defined(OS_POSIX) | 168 #elif defined(OS_POSIX) |
168 #include "chrome/browser/chrome_browser_main_posix.h" | 169 #include "chrome/browser/chrome_browser_main_posix.h" |
169 #endif | 170 #endif |
170 | 171 |
171 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) | 172 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) |
172 #include "base/linux_util.h" | 173 #include "base/linux_util.h" |
173 #include "chrome/browser/crash_handler_host_linux.h" | 174 #include "chrome/browser/crash_handler_host_linux.h" |
174 #endif | 175 #endif |
175 | 176 |
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
850 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); | 851 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); |
851 #endif | 852 #endif |
852 #if !defined(DISABLE_NACL) | 853 #if !defined(DISABLE_NACL) |
853 ExtensionInfoMap* extension_info_map = | 854 ExtensionInfoMap* extension_info_map = |
854 extensions::ExtensionSystem::Get(profile)->info_map(); | 855 extensions::ExtensionSystem::Get(profile)->info_map(); |
855 host->GetChannel()->AddFilter(new NaClHostMessageFilter( | 856 host->GetChannel()->AddFilter(new NaClHostMessageFilter( |
856 id, profile->IsOffTheRecord(), | 857 id, profile->IsOffTheRecord(), |
857 profile->GetPath(), extension_info_map, | 858 profile->GetPath(), extension_info_map, |
858 context)); | 859 context)); |
859 #endif | 860 #endif |
| 861 #if defined(OS_ANDROID) |
| 862 host->GetChannel()->AddFilter(new EncryptedMediaMessageFilterAndroid()); |
| 863 #endif |
860 | 864 |
861 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 865 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
862 profile->IsOffTheRecord())); | 866 profile->IsOffTheRecord())); |
863 | 867 |
864 SendExtensionWebRequestStatusToHost(host); | 868 SendExtensionWebRequestStatusToHost(host); |
865 | 869 |
866 RendererContentSettingRules rules; | 870 RendererContentSettingRules rules; |
867 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); | 871 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); |
868 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | 872 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); |
869 } | 873 } |
(...skipping 1652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2522 #if defined(USE_NSS) | 2526 #if defined(USE_NSS) |
2523 crypto::CryptoModuleBlockingPasswordDelegate* | 2527 crypto::CryptoModuleBlockingPasswordDelegate* |
2524 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2528 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2525 const GURL& url) { | 2529 const GURL& url) { |
2526 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2530 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2527 chrome::kCryptoModulePasswordKeygen, url.host()); | 2531 chrome::kCryptoModulePasswordKeygen, url.host()); |
2528 } | 2532 } |
2529 #endif | 2533 #endif |
2530 | 2534 |
2531 } // namespace chrome | 2535 } // namespace chrome |
OLD | NEW |