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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 #include "chrome/browser/profiles/profile_io_data.h" | 63 #include "chrome/browser/profiles/profile_io_data.h" |
64 #include "chrome/browser/profiles/profile_manager.h" | 64 #include "chrome/browser/profiles/profile_manager.h" |
65 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 65 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
66 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 66 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
67 #include "chrome/browser/search/instant_service.h" | 67 #include "chrome/browser/search/instant_service.h" |
68 #include "chrome/browser/search/instant_service_factory.h" | 68 #include "chrome/browser/search/instant_service_factory.h" |
69 #include "chrome/browser/search/search.h" | 69 #include "chrome/browser/search/search.h" |
70 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" | 70 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" |
71 #include "chrome/browser/signin/principals_message_filter.h" | 71 #include "chrome/browser/signin/principals_message_filter.h" |
72 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 72 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
| 73 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" |
| 74 #include "chrome/browser/speech/tts_controller.h" |
73 #include "chrome/browser/speech/tts_message_filter.h" | 75 #include "chrome/browser/speech/tts_message_filter.h" |
74 #include "chrome/browser/ssl/ssl_add_certificate.h" | 76 #include "chrome/browser/ssl/ssl_add_certificate.h" |
75 #include "chrome/browser/ssl/ssl_blocking_page.h" | 77 #include "chrome/browser/ssl/ssl_blocking_page.h" |
76 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 78 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
77 #include "chrome/browser/tab_contents/tab_util.h" | 79 #include "chrome/browser/tab_contents/tab_util.h" |
78 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 80 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
79 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 81 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
80 #include "chrome/browser/ui/chrome_select_file_policy.h" | 82 #include "chrome/browser/ui/chrome_select_file_policy.h" |
81 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 83 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
82 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 84 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
651 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) | 653 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) |
652 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); | 654 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); |
653 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) | 655 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) |
654 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); | 656 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); |
655 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) | 657 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) |
656 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); | 658 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); |
657 #endif | 659 #endif |
658 | 660 |
659 permissions_policy_delegate_.reset( | 661 permissions_policy_delegate_.reset( |
660 new extensions::BrowserPermissionsPolicyDelegate()); | 662 new extensions::BrowserPermissionsPolicyDelegate()); |
| 663 |
| 664 #if !defined(OS_ANDROID) |
| 665 TtsExtensionEngine* tts_extension_engine = TtsExtensionEngine::GetInstance(); |
| 666 TtsController::GetInstance()->SetTtsEngineDelegate(tts_extension_engine); |
| 667 #endif |
661 } | 668 } |
662 | 669 |
663 ChromeContentBrowserClient::~ChromeContentBrowserClient() { | 670 ChromeContentBrowserClient::~ChromeContentBrowserClient() { |
664 } | 671 } |
665 | 672 |
666 // static | 673 // static |
667 void ChromeContentBrowserClient::RegisterProfilePrefs( | 674 void ChromeContentBrowserClient::RegisterProfilePrefs( |
668 user_prefs::PrefRegistrySyncable* registry) { | 675 user_prefs::PrefRegistrySyncable* registry) { |
669 registry->RegisterBooleanPref( | 676 registry->RegisterBooleanPref( |
670 prefs::kDisable3DAPIs, | 677 prefs::kDisable3DAPIs, |
(...skipping 2130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2801 switches::kDisableWebRtcEncryption, | 2808 switches::kDisableWebRtcEncryption, |
2802 }; | 2809 }; |
2803 to_command_line->CopySwitchesFrom(from_command_line, | 2810 to_command_line->CopySwitchesFrom(from_command_line, |
2804 kWebRtcDevSwitchNames, | 2811 kWebRtcDevSwitchNames, |
2805 arraysize(kWebRtcDevSwitchNames)); | 2812 arraysize(kWebRtcDevSwitchNames)); |
2806 } | 2813 } |
2807 } | 2814 } |
2808 #endif // defined(ENABLE_WEBRTC) | 2815 #endif // defined(ENABLE_WEBRTC) |
2809 | 2816 |
2810 } // namespace chrome | 2817 } // namespace chrome |
OLD | NEW |