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

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: Rebased from master. 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 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 1268 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
1269 const Extension* extension = 1269 const Extension* extension =
1270 io_data->GetExtensionInfoMap()->extensions().GetByID(url.host()); 1270 io_data->GetExtensionInfoMap()->extensions().GetByID(url.host());
1271 return extension ? extension->name() : std::string(); 1271 return extension ? extension->name() : std::string();
1272 } 1272 }
1273 1273
1274 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() { 1274 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
1275 return g_browser_process->ResourceDispatcherHostCreated(); 1275 return g_browser_process->ResourceDispatcherHostCreated();
1276 } 1276 }
1277 1277
1278 content::SpeechInputManagerDelegate* 1278 content::SpeechRecognitionManagerDelegate*
1279 ChromeContentBrowserClient::GetSpeechInputManagerDelegate() { 1279 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
1280 return new speech_input::ChromeSpeechInputManagerDelegate(); 1280 return new speech::ChromeSpeechRecognitionManagerDelegate();
1281 } 1281 }
1282 1282
1283 ui::Clipboard* ChromeContentBrowserClient::GetClipboard() { 1283 ui::Clipboard* ChromeContentBrowserClient::GetClipboard() {
1284 return g_browser_process->clipboard(); 1284 return g_browser_process->clipboard();
1285 } 1285 }
1286 1286
1287 net::NetLog* ChromeContentBrowserClient::GetNetLog() { 1287 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
1288 return g_browser_process->net_log(); 1288 return g_browser_process->net_log();
1289 } 1289 }
1290 1290
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 #if defined(USE_NSS) 1584 #if defined(USE_NSS)
1585 crypto::CryptoModuleBlockingPasswordDelegate* 1585 crypto::CryptoModuleBlockingPasswordDelegate*
1586 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1586 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1587 const GURL& url) { 1587 const GURL& url) {
1588 return browser::NewCryptoModuleBlockingDialogDelegate( 1588 return browser::NewCryptoModuleBlockingDialogDelegate(
1589 browser::kCryptoModulePasswordKeygen, url.host()); 1589 browser::kCryptoModulePasswordKeygen, url.host());
1590 } 1590 }
1591 #endif 1591 #endif
1592 1592
1593 } // namespace chrome 1593 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/profiles/off_the_record_profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698