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

Side by Side Diff: chrome/test/base/testing_profile.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
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/mock_content_browser_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/notifications/desktop_notification_service.h" 29 #include "chrome/browser/notifications/desktop_notification_service.h"
30 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 30 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
31 #include "chrome/browser/prefs/browser_prefs.h" 31 #include "chrome/browser/prefs/browser_prefs.h"
32 #include "chrome/browser/prefs/testing_pref_store.h" 32 #include "chrome/browser/prefs/testing_pref_store.h"
33 #include "chrome/browser/prerender/prerender_manager.h" 33 #include "chrome/browser/prerender/prerender_manager.h"
34 #include "chrome/browser/profiles/profile_dependency_manager.h" 34 #include "chrome/browser/profiles/profile_dependency_manager.h"
35 #include "chrome/browser/search_engines/template_url_fetcher.h" 35 #include "chrome/browser/search_engines/template_url_fetcher.h"
36 #include "chrome/browser/search_engines/template_url_service.h" 36 #include "chrome/browser/search_engines/template_url_service.h"
37 #include "chrome/browser/search_engines/template_url_service_factory.h" 37 #include "chrome/browser/search_engines/template_url_service_factory.h"
38 #include "chrome/browser/signin/token_service.h" 38 #include "chrome/browser/signin/token_service.h"
39 #include "chrome/browser/speech/chrome_speech_input_preferences.h" 39 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
40 #include "chrome/browser/sync/profile_sync_service_mock.h" 40 #include "chrome/browser/sync/profile_sync_service_mock.h"
41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
42 #include "chrome/common/chrome_constants.h" 42 #include "chrome/common/chrome_constants.h"
43 #include "chrome/common/chrome_notification_types.h" 43 #include "chrome/common/chrome_notification_types.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
46 #include "chrome/test/base/bookmark_load_observer.h" 46 #include "chrome/test/base/bookmark_load_observer.h"
47 #include "chrome/test/base/testing_pref_service.h" 47 #include "chrome/test/base/testing_pref_service.h"
48 #include "chrome/test/base/ui_test_utils.h" 48 #include "chrome/test/base/ui_test_utils.h"
49 #include "content/public/browser/browser_thread.h" 49 #include "content/public/browser/browser_thread.h"
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 644
645 content::GeolocationPermissionContext* 645 content::GeolocationPermissionContext*
646 TestingProfile::GetGeolocationPermissionContext() { 646 TestingProfile::GetGeolocationPermissionContext() {
647 if (!geolocation_permission_context_.get()) { 647 if (!geolocation_permission_context_.get()) {
648 geolocation_permission_context_ = 648 geolocation_permission_context_ =
649 new ChromeGeolocationPermissionContext(this); 649 new ChromeGeolocationPermissionContext(this);
650 } 650 }
651 return geolocation_permission_context_.get(); 651 return geolocation_permission_context_.get();
652 } 652 }
653 653
654 content::SpeechInputPreferences* TestingProfile::GetSpeechInputPreferences() { 654 content::SpeechRecognitionPreferences*
655 TestingProfile::GetSpeechRecognitionPreferences() {
655 #if defined(ENABLE_INPUT_SPEECH) 656 #if defined(ENABLE_INPUT_SPEECH)
656 if (!speech_input_preferences_.get()) 657 if (!speech_recognition_preferences_.get())
657 speech_input_preferences_ = new ChromeSpeechInputPreferences(GetPrefs()); 658 speech_recognition_preferences_ =
658 return speech_input_preferences_.get(); 659 new ChromeSpeechRecognitionPreferences(GetPrefs());
660 return speech_recognition_preferences_.get();
659 #else 661 #else
660 return NULL; 662 return NULL;
661 #endif 663 #endif
662 } 664 }
663 665
664 std::wstring TestingProfile::GetName() { 666 std::wstring TestingProfile::GetName() {
665 return std::wstring(); 667 return std::wstring();
666 } 668 }
667 669
668 std::wstring TestingProfile::GetID() { 670 std::wstring TestingProfile::GetID() {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() { 767 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
766 return GetExtensionSpecialStoragePolicy(); 768 return GetExtensionSpecialStoragePolicy();
767 } 769 }
768 770
769 void TestingProfile::DestroyWebDataService() { 771 void TestingProfile::DestroyWebDataService() {
770 if (!web_data_service_.get()) 772 if (!web_data_service_.get())
771 return; 773 return;
772 774
773 web_data_service_->Shutdown(); 775 web_data_service_->Shutdown();
774 } 776 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/mock_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698