Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 7729001: Get rid of link dependency from content to chrome. Make it get the SpeechInputManager through the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/app/breakpad_mac.h" 8 #include "chrome/app/breakpad_mac.h"
9 #include "chrome/browser/browser_about_handler.h" 9 #include "chrome/browser/browser_about_handler.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/prefs/pref_service.h" 28 #include "chrome/browser/prefs/pref_service.h"
29 #include "chrome/browser/prerender/prerender_manager.h" 29 #include "chrome/browser/prerender/prerender_manager.h"
30 #include "chrome/browser/prerender/prerender_tracker.h" 30 #include "chrome/browser/prerender/prerender_tracker.h"
31 #include "chrome/browser/printing/printing_message_filter.h" 31 #include "chrome/browser/printing/printing_message_filter.h"
32 #include "chrome/browser/profiles/profile.h" 32 #include "chrome/browser/profiles/profile.h"
33 #include "chrome/browser/profiles/profile_io_data.h" 33 #include "chrome/browser/profiles/profile_io_data.h"
34 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 34 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
35 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" 35 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
36 #include "chrome/browser/renderer_host/text_input_client_message_filter.h" 36 #include "chrome/browser/renderer_host/text_input_client_message_filter.h"
37 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 37 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
38 #include "chrome/browser/speech/chrome_speech_input_manager.h"
38 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 39 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
39 #include "chrome/browser/ssl/ssl_add_cert_handler.h" 40 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
40 #include "chrome/browser/ssl/ssl_blocking_page.h" 41 #include "chrome/browser/ssl/ssl_blocking_page.h"
41 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 42 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
42 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" 43 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
43 #include "chrome/browser/tab_contents/tab_util.h" 44 #include "chrome/browser/tab_contents/tab_util.h"
44 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 45 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
45 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h" 46 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
46 #include "chrome/common/child_process_logging.h" 47 #include "chrome/common/child_process_logging.h"
47 #include "chrome/common/chrome_switches.h" 48 #include "chrome/common/chrome_switches.h"
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 } 659 }
659 660
660 DevToolsManager* ChromeContentBrowserClient::GetDevToolsManager() { 661 DevToolsManager* ChromeContentBrowserClient::GetDevToolsManager() {
661 return g_browser_process->devtools_manager(); 662 return g_browser_process->devtools_manager();
662 } 663 }
663 664
664 net::NetLog* ChromeContentBrowserClient::GetNetLog() { 665 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
665 return g_browser_process->net_log(); 666 return g_browser_process->net_log();
666 } 667 }
667 668
669 speech_input::SpeechInputManager*
670 ChromeContentBrowserClient::GetSpeechInputManager() {
671 return speech_input::ChromeSpeechInputManager::GetInstance();
672 }
673
668 bool ChromeContentBrowserClient::IsFastShutdownPossible() { 674 bool ChromeContentBrowserClient::IsFastShutdownPossible() {
669 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); 675 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
670 return !browser_command_line.HasSwitch(switches::kChromeFrame); 676 return !browser_command_line.HasSwitch(switches::kChromeFrame);
671 } 677 }
672 678
673 WebPreferences ChromeContentBrowserClient::GetWebkitPrefs( 679 WebPreferences ChromeContentBrowserClient::GetWebkitPrefs(
674 content::BrowserContext* browser_context, bool is_web_ui) { 680 content::BrowserContext* browser_context, bool is_web_ui) {
675 return RenderViewHostDelegateHelper::GetWebkitPrefs(browser_context, 681 return RenderViewHostDelegateHelper::GetWebkitPrefs(browser_context,
676 is_web_ui); 682 is_web_ui);
677 } 683 }
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 #if defined(USE_NSS) 767 #if defined(USE_NSS)
762 crypto::CryptoModuleBlockingPasswordDelegate* 768 crypto::CryptoModuleBlockingPasswordDelegate*
763 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 769 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
764 const GURL& url) { 770 const GURL& url) {
765 return browser::NewCryptoModuleBlockingDialogDelegate( 771 return browser::NewCryptoModuleBlockingDialogDelegate(
766 browser::kCryptoModulePasswordKeygen, url.host()); 772 browser::kCryptoModulePasswordKeygen, url.host());
767 } 773 }
768 #endif 774 #endif
769 775
770 } // namespace chrome 776 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698