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 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
907 #if defined(ENABLE_PRINTING) | 907 #if defined(ENABLE_PRINTING) |
908 host->AddFilter(new PrintingMessageFilter(id, profile)); | 908 host->AddFilter(new PrintingMessageFilter(id, profile)); |
909 #endif | 909 #endif |
910 host->AddFilter(new SearchProviderInstallStateMessageFilter(id, profile)); | 910 host->AddFilter(new SearchProviderInstallStateMessageFilter(id, profile)); |
911 #if defined(ENABLE_SPELLCHECK) | 911 #if defined(ENABLE_SPELLCHECK) |
912 host->AddFilter(new SpellCheckMessageFilter(id)); | 912 host->AddFilter(new SpellCheckMessageFilter(id)); |
913 #endif | 913 #endif |
914 #if defined(OS_MACOSX) | 914 #if defined(OS_MACOSX) |
915 host->AddFilter(new SpellCheckMessageFilterMac(id)); | 915 host->AddFilter(new SpellCheckMessageFilterMac(id)); |
916 #endif | 916 #endif |
917 host->AddFilter(new ChromeNetBenchmarkingMessageFilter( | 917 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
918 id, profile, context)); | |
919 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 918 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
920 host->AddFilter(new TtsMessageFilter(id, profile)); | 919 host->AddFilter(new TtsMessageFilter(id, profile)); |
921 #if defined(ENABLE_WEBRTC) | 920 #if defined(ENABLE_WEBRTC) |
922 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 921 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
923 new WebRtcLoggingHandlerHost(profile); | 922 new WebRtcLoggingHandlerHost(profile); |
924 host->AddFilter(webrtc_logging_handler_host); | 923 host->AddFilter(webrtc_logging_handler_host); |
925 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 924 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
926 webrtc_logging_handler_host)); | 925 webrtc_logging_handler_host)); |
927 #endif | 926 #endif |
928 #if !defined(DISABLE_NACL) | 927 #if !defined(DISABLE_NACL) |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1510 extensions::switches::kAllowLegacyExtensionManifests, | 1509 extensions::switches::kAllowLegacyExtensionManifests, |
1511 extensions::switches::kAllowScriptingGallery, | 1510 extensions::switches::kAllowScriptingGallery, |
1512 extensions::switches::kEnableExperimentalExtensionApis, | 1511 extensions::switches::kEnableExperimentalExtensionApis, |
1513 extensions::switches::kExtensionsOnChromeURLs, | 1512 extensions::switches::kExtensionsOnChromeURLs, |
1514 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO | 1513 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO |
1515 // to browser. | 1514 // to browser. |
1516 switches::kAllowNaClFileHandleAPI, | 1515 switches::kAllowNaClFileHandleAPI, |
1517 switches::kAppsCheckoutURL, | 1516 switches::kAppsCheckoutURL, |
1518 switches::kAppsGalleryURL, | 1517 switches::kAppsGalleryURL, |
1519 switches::kCloudPrintServiceURL, | 1518 switches::kCloudPrintServiceURL, |
1520 switches::kDebugPrint, | |
1521 switches::kDisableBundledPpapiFlash, | 1519 switches::kDisableBundledPpapiFlash, |
1522 switches::kDisableExtensionsResourceWhitelist, | 1520 switches::kDisableExtensionsResourceWhitelist, |
1523 switches::kDisablePnacl, | 1521 switches::kDisablePnacl, |
1524 switches::kDisableScriptedPrintThrottling, | 1522 switches::kDisableScriptedPrintThrottling, |
1525 switches::kEnableAdview, | 1523 switches::kEnableAdview, |
1526 switches::kEnableAdviewSrcAttribute, | 1524 switches::kEnableAdviewSrcAttribute, |
1527 switches::kEnableAppWindowControls, | 1525 switches::kEnableAppWindowControls, |
1528 switches::kEnableBenchmarking, | 1526 switches::kEnableBenchmarking, |
1529 switches::kEnableNaCl, | 1527 switches::kEnableNaCl, |
1530 switches::kEnableNetBenchmarking, | 1528 switches::kEnableNetBenchmarking, |
(...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2661 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on | 2659 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on |
2662 // Chromium builds as well. | 2660 // Chromium builds as well. |
2663 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 2661 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
2664 #else | 2662 #else |
2665 return false; | 2663 return false; |
2666 #endif | 2664 #endif |
2667 } | 2665 } |
2668 | 2666 |
2669 | 2667 |
2670 } // namespace chrome | 2668 } // namespace chrome |
OLD | NEW |