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

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 private: 64 private:
65 friend struct DefaultSingletonTraits<Factory>; 65 friend struct DefaultSingletonTraits<Factory>;
66 66
67 Factory(); 67 Factory();
68 virtual ~Factory(); 68 virtual ~Factory();
69 69
70 // ProfileKeyedServiceFactory methods: 70 // ProfileKeyedServiceFactory methods:
71 virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) 71 virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile)
72 const OVERRIDE; 72 const OVERRIDE;
73 virtual void RegisterUserPrefs(PrefService* prefs) OVERRIDE; 73 virtual void RegisterUserPrefs(PrefServiceSyncable* prefs) OVERRIDE;
74 virtual bool ServiceRedirectedInIncognito() const OVERRIDE; 74 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
75 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; 75 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
76 virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; 76 virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
77 77
78 DISALLOW_COPY_AND_ASSIGN(Factory); 78 DISALLOW_COPY_AND_ASSIGN(Factory);
79 }; 79 };
80 80
81 // This wrapper handles the binding between ChromeSpeechRecognitionPreferences 81 // This wrapper handles the binding between ChromeSpeechRecognitionPreferences
82 // instances (which can have a longer lifetime, since they are refcounted) and 82 // instances (which can have a longer lifetime, since they are refcounted) and
83 // ProfileKeyedService (which lifetime depends on the Profile service). Upon 83 // ProfileKeyedService (which lifetime depends on the Profile service). Upon
(...skipping 29 matching lines...) Expand all
113 scoped_ptr<base::ListValue> notifications_shown_; 113 scoped_ptr<base::ListValue> notifications_shown_;
114 114
115 // Lock used to ensure exclusive access to preference variables that are 115 // Lock used to ensure exclusive access to preference variables that are
116 // accessed by both threads (note: mutable is required to keep getters const). 116 // accessed by both threads (note: mutable is required to keep getters const).
117 mutable base::Lock preferences_lock_; 117 mutable base::Lock preferences_lock_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences); 119 DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences);
120 }; 120 };
121 121
122 #endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_ 122 #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