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

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

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 #ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_ 5 #ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
6 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_ 6 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/prefs/public/pref_change_registrar.h" 12 #include "base/prefs/public/pref_change_registrar.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "base/threading/non_thread_safe.h" 14 #include "base/threading/non_thread_safe.h"
15 #include "chrome/browser/profiles/profile_keyed_service.h" 15 #include "chrome/browser/profiles/profile_keyed_service.h"
16 #include "chrome/browser/profiles/profile_keyed_service_factory.h" 16 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
17 #include "content/public/browser/speech_recognition_preferences.h" 17 #include "content/public/browser/speech_recognition_preferences.h"
18 18
19 class PrefRegistrySyncable;
19 class PrefService; 20 class PrefService;
20 21
21 namespace base { 22 namespace base {
22 class ListValue; 23 class ListValue;
23 } 24 }
24 25
25 // Utility class that handles persistent storage of speech recognition 26 // Utility class that handles persistent storage of speech recognition
26 // preferences. Instances of this class must be obtained exclusively through the 27 // preferences. Instances of this class must be obtained exclusively through the
27 // method ChromeSpeechRecognitionPreferences::GetForProfile(...), so that 28 // method ChromeSpeechRecognitionPreferences::GetForProfile(...), so that
28 // preferences are handled within the Profile (if not NULL). The internal 29 // preferences are handled within the Profile (if not NULL). The internal
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 64
64 private: 65 private:
65 friend struct DefaultSingletonTraits<Factory>; 66 friend struct DefaultSingletonTraits<Factory>;
66 67
67 Factory(); 68 Factory();
68 virtual ~Factory(); 69 virtual ~Factory();
69 70
70 // ProfileKeyedServiceFactory methods: 71 // ProfileKeyedServiceFactory methods:
71 virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) 72 virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile)
72 const OVERRIDE; 73 const OVERRIDE;
73 virtual void RegisterUserPrefs(PrefServiceSyncable* prefs) OVERRIDE; 74 virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;
74 virtual bool ServiceRedirectedInIncognito() const OVERRIDE; 75 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
75 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; 76 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
76 virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; 77 virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
77 78
78 DISALLOW_COPY_AND_ASSIGN(Factory); 79 DISALLOW_COPY_AND_ASSIGN(Factory);
79 }; 80 };
80 81
81 // This wrapper handles the binding between ChromeSpeechRecognitionPreferences 82 // This wrapper handles the binding between ChromeSpeechRecognitionPreferences
82 // instances (which can have a longer lifetime, since they are refcounted) and 83 // instances (which can have a longer lifetime, since they are refcounted) and
83 // ProfileKeyedService (which lifetime depends on the Profile service). Upon 84 // ProfileKeyedService (which lifetime depends on the Profile service). Upon
(...skipping 29 matching lines...) Expand all
113 scoped_ptr<base::ListValue> notifications_shown_; 114 scoped_ptr<base::ListValue> notifications_shown_;
114 115
115 // Lock used to ensure exclusive access to preference variables that are 116 // Lock used to ensure exclusive access to preference variables that are
116 // accessed by both threads (note: mutable is required to keep getters const). 117 // accessed by both threads (note: mutable is required to keep getters const).
117 mutable base::Lock preferences_lock_; 118 mutable base::Lock preferences_lock_;
118 119
119 DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences); 120 DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences);
120 }; 121 };
121 122
122 #endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_ 123 #endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_manager_unittest.cc ('k') | chrome/browser/speech/chrome_speech_recognition_preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698