diff options
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 2 | ||||
| -rw-r--r-- | content/browser/speech/speech_recognition_manager_impl.cc | 6 |
2 files changed, 0 insertions, 8 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( |