| 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/speech/chrome_speech_recognition_preferences.h" | 5 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 } | 58 } |
| 59 | 59 |
| 60 ProfileKeyedService* | 60 ProfileKeyedService* |
| 61 ChromeSpeechRecognitionPreferences::Factory::BuildServiceInstanceFor( | 61 ChromeSpeechRecognitionPreferences::Factory::BuildServiceInstanceFor( |
| 62 Profile* profile) const { | 62 Profile* profile) const { |
| 63 DCHECK(profile); | 63 DCHECK(profile); |
| 64 return new ChromeSpeechRecognitionPreferences::Service(profile); | 64 return new ChromeSpeechRecognitionPreferences::Service(profile); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void ChromeSpeechRecognitionPreferences::Factory::RegisterUserPrefs( | 67 void ChromeSpeechRecognitionPreferences::Factory::RegisterUserPrefs( |
| 68 PrefService* prefs) { | 68 PrefServiceSyncable* prefs) { |
| 69 prefs->RegisterBooleanPref( | 69 prefs->RegisterBooleanPref( |
| 70 prefs::kSpeechRecognitionFilterProfanities, | 70 prefs::kSpeechRecognitionFilterProfanities, |
| 71 kDefaultFilterProfanities, | 71 kDefaultFilterProfanities, |
| 72 PrefService::UNSYNCABLE_PREF); | 72 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 73 | 73 |
| 74 prefs->RegisterListPref( | 74 prefs->RegisterListPref( |
| 75 prefs::kSpeechRecognitionTrayNotificationShownContexts, | 75 prefs::kSpeechRecognitionTrayNotificationShownContexts, |
| 76 PrefService::UNSYNCABLE_PREF); | 76 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 77 } | 77 } |
| 78 | 78 |
| 79 bool ChromeSpeechRecognitionPreferences::Factory:: | 79 bool ChromeSpeechRecognitionPreferences::Factory:: |
| 80 ServiceRedirectedInIncognito() const { | 80 ServiceRedirectedInIncognito() const { |
| 81 return false; | 81 return false; |
| 82 } | 82 } |
| 83 | 83 |
| 84 bool ChromeSpeechRecognitionPreferences::Factory:: | 84 bool ChromeSpeechRecognitionPreferences::Factory:: |
| 85 ServiceIsNULLWhileTesting() const { | 85 ServiceIsNULLWhileTesting() const { |
| 86 return true; | 86 return true; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 prefs::kSpeechRecognitionFilterProfanities); | 213 prefs::kSpeechRecognitionFilterProfanities); |
| 214 } | 214 } |
| 215 | 215 |
| 216 void ChromeSpeechRecognitionPreferences::ReloadNotificationsShown() { | 216 void ChromeSpeechRecognitionPreferences::ReloadNotificationsShown() { |
| 217 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 217 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 218 base::AutoLock write_lock(preferences_lock_); | 218 base::AutoLock write_lock(preferences_lock_); |
| 219 const base::ListValue* pref_list = profile_->GetPrefs()->GetList( | 219 const base::ListValue* pref_list = profile_->GetPrefs()->GetList( |
| 220 prefs::kSpeechRecognitionTrayNotificationShownContexts); | 220 prefs::kSpeechRecognitionTrayNotificationShownContexts); |
| 221 notifications_shown_.reset(pref_list->DeepCopy()); | 221 notifications_shown_.reset(pref_list->DeepCopy()); |
| 222 } | 222 } |
| OLD | NEW |