Chromium Code Reviews| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 #include "chrome/browser/prerender/prerender_tracker.h" | 57 #include "chrome/browser/prerender/prerender_tracker.h" |
| 58 #include "chrome/browser/printing/printing_message_filter.h" | 58 #include "chrome/browser/printing/printing_message_filter.h" |
| 59 #include "chrome/browser/profiles/profile.h" | 59 #include "chrome/browser/profiles/profile.h" |
| 60 #include "chrome/browser/profiles/profile_io_data.h" | 60 #include "chrome/browser/profiles/profile_io_data.h" |
| 61 #include "chrome/browser/profiles/profile_manager.h" | 61 #include "chrome/browser/profiles/profile_manager.h" |
| 62 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 62 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
| 63 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" | 63 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" |
| 64 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" | 64 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" |
| 65 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" | 65 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" |
| 66 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 66 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
| 67 #include "chrome/browser/speech/tts_request_handler.h" | |
| 67 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" | 68 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" |
| 68 #include "chrome/browser/ssl/ssl_add_certificate.h" | 69 #include "chrome/browser/ssl/ssl_add_certificate.h" |
| 69 #include "chrome/browser/ssl/ssl_blocking_page.h" | 70 #include "chrome/browser/ssl/ssl_blocking_page.h" |
| 70 #include "chrome/browser/ssl/ssl_tab_helper.h" | 71 #include "chrome/browser/ssl/ssl_tab_helper.h" |
| 71 #include "chrome/browser/tab_contents/tab_util.h" | 72 #include "chrome/browser/tab_contents/tab_util.h" |
| 72 #include "chrome/browser/toolkit_extra_parts.h" | 73 #include "chrome/browser/toolkit_extra_parts.h" |
| 73 #include "chrome/browser/ui/chrome_select_file_policy.h" | 74 #include "chrome/browser/ui/chrome_select_file_policy.h" |
| 74 #include "chrome/browser/ui/search/search.h" | 75 #include "chrome/browser/ui/search/search.h" |
| 75 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 76 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
| 76 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 77 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| (...skipping 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1668 | 1669 |
| 1669 content::SpeechRecognitionManagerDelegate* | 1670 content::SpeechRecognitionManagerDelegate* |
| 1670 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() { | 1671 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() { |
| 1671 #if defined(ENABLE_INPUT_SPEECH) | 1672 #if defined(ENABLE_INPUT_SPEECH) |
| 1672 return new speech::ChromeSpeechRecognitionManagerDelegate(); | 1673 return new speech::ChromeSpeechRecognitionManagerDelegate(); |
| 1673 #else | 1674 #else |
| 1674 return NULL; | 1675 return NULL; |
| 1675 #endif | 1676 #endif |
| 1676 } | 1677 } |
| 1677 | 1678 |
| 1679 content::TtsDispatcherHostDelegate* | |
| 1680 ChromeContentBrowserClient::GetTtsDispatcherHostDelegate() { | |
| 1681 return new TtsRequestHandler(); | |
|
tommi (sloooow) - chröme
2013/03/07 13:04:46
it would be great to start using scoped_ptr's supp
dmazzoni
2013/03/19 17:30:22
Cool - done, and added the TODO for you.
| |
| 1682 } | |
| 1683 | |
| 1678 net::NetLog* ChromeContentBrowserClient::GetNetLog() { | 1684 net::NetLog* ChromeContentBrowserClient::GetNetLog() { |
| 1679 return g_browser_process->net_log(); | 1685 return g_browser_process->net_log(); |
| 1680 } | 1686 } |
| 1681 | 1687 |
| 1682 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { | 1688 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { |
| 1683 return new ChromeAccessTokenStore(); | 1689 return new ChromeAccessTokenStore(); |
| 1684 } | 1690 } |
| 1685 | 1691 |
| 1686 bool ChromeContentBrowserClient::IsFastShutdownPossible() { | 1692 bool ChromeContentBrowserClient::IsFastShutdownPossible() { |
| 1687 return true; | 1693 return true; |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2096 io_thread_application_locale_ = locale; | 2102 io_thread_application_locale_ = locale; |
| 2097 } | 2103 } |
| 2098 | 2104 |
| 2099 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 2105 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
| 2100 const std::string& locale) { | 2106 const std::string& locale) { |
| 2101 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 2107 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 2102 io_thread_application_locale_ = locale; | 2108 io_thread_application_locale_ = locale; |
| 2103 } | 2109 } |
| 2104 | 2110 |
| 2105 } // namespace chrome | 2111 } // namespace chrome |
| OLD | NEW |