diff options
| -rw-r--r-- | content/browser/browser_main_loop.cc | 2 | ||||
| -rw-r--r-- | content/browser/speech/speech_recognition_manager_impl.cc | 6 | ||||
| -rw-r--r-- | content/content_browser.gypi | 4 | ||||
| -rw-r--r-- | content/content_tests.gypi | 1 |
4 files changed, 0 insertions, 13 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 5a8c2fd..742d675 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -824,7 +824,6 @@ void BrowserMainLoop::BrowserThreadsStarted() { // Initialize the GpuDataManager before we set up the MessageLoops because // otherwise we'll trigger the assertion about doing IO on the UI thread. GpuDataManagerImpl::GetInstance()->Initialize(); -#endif // !OS_IOS { TRACE_EVENT0("startup", @@ -832,7 +831,6 @@ void BrowserMainLoop::BrowserThreadsStarted() { speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl()); } -#if !defined(OS_IOS) // Alert the clipboard class to which threads are allowed to access the // clipboard: std::vector<base::PlatformThreadId> allowed_clipboard_threads; diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index ba7e8dc..dffd6f3 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc @@ -179,11 +179,6 @@ void SpeechRecognitionManagerImpl::RecognitionAllowedCallback(int session_id, if (!SessionExists(session_id)) return; -#if defined(OS_IOS) - // On iOS, voice search can only be initiated by clear user action and thus - // it is always allowed. - DCHECK(!ask_user && is_allowed); -#else if (ask_user) { SessionsTable::iterator iter = sessions_.find(session_id); DCHECK(iter != sessions_.end()); @@ -199,7 +194,6 @@ void SpeechRecognitionManagerImpl::RecognitionAllowedCallback(int session_id, weak_factory_.GetWeakPtr(), session_id)); return; } -#endif // defined(OS_IOS) if (is_allowed) { base::MessageLoop::current()->PostTask( diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 7108227..cbaad69 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1137,7 +1137,6 @@ ['include', '^public/browser/navigation_details\\.cc$'], ['include', '^public/browser/notification_registrar\\.cc$'], ['include', '^public/browser/page_navigator\\.cc$'], - ['include', '^public/browser/speech_recognition_'], ['include', '^public/browser/web_ui_controller\\.cc'], ['include', '^browser/browser_context\\.cc$'], ['include', '^browser/browser_main_loop\\.cc$'], @@ -1149,9 +1148,6 @@ ['include', '^browser/download/download_create_info\\.cc$'], ['include', '^browser/notification_service_impl\\.cc$'], ['include', '^browser/storage_partition_impl\\.cc$'], - # Pull in all but one file from speech. - ['include', '^browser/speech/'], - ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.cc$$'], ['include', '^browser/user_metrics\\.cc$'], ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'], ], diff --git a/content/content_tests.gypi b/content/content_tests.gypi index b8a1a36..6eb68cc 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -547,7 +547,6 @@ ['exclude', '\\.(cc|mm)$'], ['include', '_ios\\.(cc|mm)$'], ['include', '^browser/notification_service_impl_unittest\\.cc$'], - ['include', '^browser/speech/.*_unittest\\.cc$'], ['include', '^browser/web_contents/navigation_entry_impl_unittest\\.cc$'], ['include', '^test/run_all_unittests\\.cc$'], ], |