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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
143 #include "ui/base/l10n/l10n_util.h" | 143 #include "ui/base/l10n/l10n_util.h" |
144 #include "ui/base/resource/resource_bundle.h" | 144 #include "ui/base/resource/resource_bundle.h" |
145 #include "ui/resources/grit/ui_resources.h" | 145 #include "ui/resources/grit/ui_resources.h" |
146 | 146 |
147 #if defined(OS_WIN) | 147 #if defined(OS_WIN) |
148 #include "base/win/windows_version.h" | 148 #include "base/win/windows_version.h" |
149 #include "chrome/browser/chrome_browser_main_win.h" | 149 #include "chrome/browser/chrome_browser_main_win.h" |
150 #include "sandbox/win/src/sandbox_policy.h" | 150 #include "sandbox/win/src/sandbox_policy.h" |
151 #elif defined(OS_MACOSX) | 151 #elif defined(OS_MACOSX) |
152 #include "chrome/browser/chrome_browser_main_mac.h" | 152 #include "chrome/browser/chrome_browser_main_mac.h" |
153 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" | 153 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
please use gerrit instead
2015/07/09 22:21:29
This include should be moved to "#if defined(USE_P
dylanking
2015/07/09 23:49:57
Done, also changed a reference to SpellCheckMessag
| |
154 #elif defined(OS_CHROMEOS) | 154 #elif defined(OS_CHROMEOS) |
155 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h" | 155 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h" |
156 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 156 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
157 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" | 157 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" |
158 #include "chrome/browser/chromeos/file_manager/app_id.h" | 158 #include "chrome/browser/chromeos/file_manager/app_id.h" |
159 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" | 159 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" |
160 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" | 160 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" |
161 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" | 161 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" |
162 #include "chrome/browser/chromeos/login/startup_utils.h" | 162 #include "chrome/browser/chromeos/login/startup_utils.h" |
163 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 163 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
834 #if defined(ENABLE_EXTENSIONS) | 834 #if defined(ENABLE_EXTENSIONS) |
835 host->AddFilter(new cast::CastTransportHostFilter); | 835 host->AddFilter(new cast::CastTransportHostFilter); |
836 #endif | 836 #endif |
837 #if defined(ENABLE_PRINTING) | 837 #if defined(ENABLE_PRINTING) |
838 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); | 838 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); |
839 #endif | 839 #endif |
840 host->AddFilter(new SearchProviderInstallStateMessageFilter(id, profile)); | 840 host->AddFilter(new SearchProviderInstallStateMessageFilter(id, profile)); |
841 #if defined(ENABLE_SPELLCHECK) | 841 #if defined(ENABLE_SPELLCHECK) |
842 host->AddFilter(new SpellCheckMessageFilter(id)); | 842 host->AddFilter(new SpellCheckMessageFilter(id)); |
843 #endif | 843 #endif |
844 #if defined(OS_MACOSX) | 844 #if defined(OS_MACOSX) |
please use gerrit instead
2015/07/09 22:21:29
s/OS_MACOSX/ENABLE_PLATFORM_SPELLCHECKER
| |
845 host->AddFilter(new SpellCheckMessageFilterMac(id)); | 845 host->AddFilter(new SpellCheckMessageFilterMac(id)); |
please use gerrit instead
2015/07/09 22:21:29
s/SpellCheckMessageFilterMac/SpellCheckMessageFilt
| |
846 #endif | 846 #endif |
847 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 847 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
848 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 848 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
849 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 849 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
850 #if defined(ENABLE_WEBRTC) | 850 #if defined(ENABLE_WEBRTC) |
851 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 851 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
852 new WebRtcLoggingHandlerHost(profile); | 852 new WebRtcLoggingHandlerHost(profile); |
853 host->SetWebRtcLogMessageCallback(base::Bind( | 853 host->SetWebRtcLogMessageCallback(base::Bind( |
854 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | 854 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
855 host->AddFilter(webrtc_logging_handler_host); | 855 host->AddFilter(webrtc_logging_handler_host); |
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2546 switches::kDisableWebRtcEncryption, | 2546 switches::kDisableWebRtcEncryption, |
2547 }; | 2547 }; |
2548 to_command_line->CopySwitchesFrom(from_command_line, | 2548 to_command_line->CopySwitchesFrom(from_command_line, |
2549 kWebRtcDevSwitchNames, | 2549 kWebRtcDevSwitchNames, |
2550 arraysize(kWebRtcDevSwitchNames)); | 2550 arraysize(kWebRtcDevSwitchNames)); |
2551 } | 2551 } |
2552 } | 2552 } |
2553 #endif // defined(ENABLE_WEBRTC) | 2553 #endif // defined(ENABLE_WEBRTC) |
2554 | 2554 |
2555 } // namespace chrome | 2555 } // namespace chrome |
OLD | NEW |