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

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

Issue 9568002: Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 9 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
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/prerender/prerender_manager_factory.h" 46 #include "chrome/browser/prerender/prerender_manager_factory.h"
47 #include "chrome/browser/prerender/prerender_tracker.h" 47 #include "chrome/browser/prerender/prerender_tracker.h"
48 #include "chrome/browser/printing/printing_message_filter.h" 48 #include "chrome/browser/printing/printing_message_filter.h"
49 #include "chrome/browser/profiles/profile.h" 49 #include "chrome/browser/profiles/profile.h"
50 #include "chrome/browser/profiles/profile_io_data.h" 50 #include "chrome/browser/profiles/profile_io_data.h"
51 #include "chrome/browser/profiles/profile_manager.h" 51 #include "chrome/browser/profiles/profile_manager.h"
52 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 52 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
53 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" 53 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
54 #include "chrome/browser/renderer_host/plugin_info_message_filter.h" 54 #include "chrome/browser/renderer_host/plugin_info_message_filter.h"
55 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 55 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
56 #include "chrome/browser/speech/chrome_speech_input_manager_delegate.h" 56 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
57 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 57 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
58 #include "chrome/browser/ssl/ssl_add_cert_handler.h" 58 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
59 #include "chrome/browser/ssl/ssl_blocking_page.h" 59 #include "chrome/browser/ssl/ssl_blocking_page.h"
60 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" 60 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
61 #include "chrome/browser/tab_contents/tab_util.h" 61 #include "chrome/browser/tab_contents/tab_util.h"
62 #include "chrome/browser/ui/media_stream_infobar_delegate.h" 62 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
63 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 63 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
64 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 64 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
65 #include "chrome/browser/user_style_sheet_watcher.h" 65 #include "chrome/browser/user_style_sheet_watcher.h"
66 #include "chrome/common/child_process_logging.h" 66 #include "chrome/common/child_process_logging.h"
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 1243 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
1244 const Extension* extension = 1244 const Extension* extension =
1245 io_data->GetExtensionInfoMap()->extensions().GetByID(url.host()); 1245 io_data->GetExtensionInfoMap()->extensions().GetByID(url.host());
1246 return extension ? extension->name() : std::string(); 1246 return extension ? extension->name() : std::string();
1247 } 1247 }
1248 1248
1249 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() { 1249 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
1250 return g_browser_process->ResourceDispatcherHostCreated(); 1250 return g_browser_process->ResourceDispatcherHostCreated();
1251 } 1251 }
1252 1252
1253 content::SpeechInputManagerDelegate* 1253 content::SpeechRecognitionManagerDelegate*
1254 ChromeContentBrowserClient::GetSpeechInputManagerDelegate() { 1254 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
1255 return new speech_input::ChromeSpeechInputManagerDelegate(); 1255 return new speech::ChromeSpeechRecognitionManagerDelegate();
1256 } 1256 }
1257 1257
1258 ui::Clipboard* ChromeContentBrowserClient::GetClipboard() { 1258 ui::Clipboard* ChromeContentBrowserClient::GetClipboard() {
1259 return g_browser_process->clipboard(); 1259 return g_browser_process->clipboard();
1260 } 1260 }
1261 1261
1262 MHTMLGenerationManager* 1262 MHTMLGenerationManager*
1263 ChromeContentBrowserClient::GetMHTMLGenerationManager() { 1263 ChromeContentBrowserClient::GetMHTMLGenerationManager() {
1264 return g_browser_process->mhtml_generation_manager(); 1264 return g_browser_process->mhtml_generation_manager();
1265 } 1265 }
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 #if defined(USE_NSS) 1534 #if defined(USE_NSS)
1535 crypto::CryptoModuleBlockingPasswordDelegate* 1535 crypto::CryptoModuleBlockingPasswordDelegate*
1536 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1536 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1537 const GURL& url) { 1537 const GURL& url) {
1538 return browser::NewCryptoModuleBlockingDialogDelegate( 1538 return browser::NewCryptoModuleBlockingDialogDelegate(
1539 browser::kCryptoModulePasswordKeygen, url.host()); 1539 browser::kCryptoModulePasswordKeygen, url.host());
1540 } 1540 }
1541 #endif 1541 #endif
1542 1542
1543 } // namespace chrome 1543 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698