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

Side by Side Diff: chrome/browser/speech/chrome_speech_recognition_preferences.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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) 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_registry_syncable.h"
9 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
12 #include "chrome/common/chrome_notification_types.h" 13 #include "chrome/common/chrome_notification_types.h"
13 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
14 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/notification_details.h" 16 #include "content/public/browser/notification_details.h"
16 17
17 using base::ListValue; 18 using base::ListValue;
18 using content::BrowserThread; 19 using content::BrowserThread;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 59 }
59 60
60 ProfileKeyedService* 61 ProfileKeyedService*
61 ChromeSpeechRecognitionPreferences::Factory::BuildServiceInstanceFor( 62 ChromeSpeechRecognitionPreferences::Factory::BuildServiceInstanceFor(
62 Profile* profile) const { 63 Profile* profile) const {
63 DCHECK(profile); 64 DCHECK(profile);
64 return new ChromeSpeechRecognitionPreferences::Service(profile); 65 return new ChromeSpeechRecognitionPreferences::Service(profile);
65 } 66 }
66 67
67 void ChromeSpeechRecognitionPreferences::Factory::RegisterUserPrefs( 68 void ChromeSpeechRecognitionPreferences::Factory::RegisterUserPrefs(
68 PrefServiceSyncable* prefs) { 69 PrefRegistrySyncable* prefs) {
69 prefs->RegisterBooleanPref( 70 prefs->RegisterBooleanPref(
70 prefs::kSpeechRecognitionFilterProfanities, 71 prefs::kSpeechRecognitionFilterProfanities,
71 kDefaultFilterProfanities, 72 kDefaultFilterProfanities,
72 PrefServiceSyncable::UNSYNCABLE_PREF); 73 PrefRegistrySyncable::UNSYNCABLE_PREF);
73 74
74 prefs->RegisterListPref( 75 prefs->RegisterListPref(
75 prefs::kSpeechRecognitionTrayNotificationShownContexts, 76 prefs::kSpeechRecognitionTrayNotificationShownContexts,
76 PrefServiceSyncable::UNSYNCABLE_PREF); 77 PrefRegistrySyncable::UNSYNCABLE_PREF);
77 } 78 }
78 79
79 bool ChromeSpeechRecognitionPreferences::Factory:: 80 bool ChromeSpeechRecognitionPreferences::Factory::
80 ServiceRedirectedInIncognito() const { 81 ServiceRedirectedInIncognito() const {
81 return false; 82 return false;
82 } 83 }
83 84
84 bool ChromeSpeechRecognitionPreferences::Factory:: 85 bool ChromeSpeechRecognitionPreferences::Factory::
85 ServiceIsNULLWhileTesting() const { 86 ServiceIsNULLWhileTesting() const {
86 return true; 87 return true;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 prefs::kSpeechRecognitionFilterProfanities); 214 prefs::kSpeechRecognitionFilterProfanities);
214 } 215 }
215 216
216 void ChromeSpeechRecognitionPreferences::ReloadNotificationsShown() { 217 void ChromeSpeechRecognitionPreferences::ReloadNotificationsShown() {
217 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 218 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
218 base::AutoLock write_lock(preferences_lock_); 219 base::AutoLock write_lock(preferences_lock_);
219 const base::ListValue* pref_list = profile_->GetPrefs()->GetList( 220 const base::ListValue* pref_list = profile_->GetPrefs()->GetList(
220 prefs::kSpeechRecognitionTrayNotificationShownContexts); 221 prefs::kSpeechRecognitionTrayNotificationShownContexts);
221 notifications_shown_.reset(pref_list->DeepCopy()); 222 notifications_shown_.reset(pref_list->DeepCopy());
222 } 223 }
OLDNEW
« no previous file with comments | « chrome/browser/speech/chrome_speech_recognition_preferences.h ('k') | chrome/browser/spellchecker/spellcheck_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698