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

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

Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile & deps Created 7 years, 7 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"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 private: 65 private:
66 friend struct DefaultSingletonTraits<Factory>; 66 friend struct DefaultSingletonTraits<Factory>;
67 67
68 Factory(); 68 Factory();
69 virtual ~Factory(); 69 virtual ~Factory();
70 70
71 // ProfileKeyedServiceFactory methods: 71 // ProfileKeyedServiceFactory methods:
72 virtual ProfileKeyedService* BuildServiceInstanceFor( 72 virtual ProfileKeyedService* BuildServiceInstanceFor(
73 content::BrowserContext* profile) const OVERRIDE; 73 content::BrowserContext* profile) const OVERRIDE;
74 virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE; 74 virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;
75 virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
76 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; 75 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
77 virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; 76 virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
78 77
79 DISALLOW_COPY_AND_ASSIGN(Factory); 78 DISALLOW_COPY_AND_ASSIGN(Factory);
80 }; 79 };
81 80
82 // This wrapper handles the binding between ChromeSpeechRecognitionPreferences 81 // This wrapper handles the binding between ChromeSpeechRecognitionPreferences
83 // 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
84 // ProfileKeyedService (which lifetime depends on the Profile service). Upon 83 // ProfileKeyedService (which lifetime depends on the Profile service). Upon
85 // profile shutdown, the ChromeSpeechRecognitionPreferences instance is 84 // profile shutdown, the ChromeSpeechRecognitionPreferences instance is
(...skipping 28 matching lines...) Expand all
114 scoped_ptr<base::ListValue> notifications_shown_; 113 scoped_ptr<base::ListValue> notifications_shown_;
115 114
116 // Lock used to ensure exclusive access to preference variables that are 115 // Lock used to ensure exclusive access to preference variables that are
117 // 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).
118 mutable base::Lock preferences_lock_; 117 mutable base::Lock preferences_lock_;
119 118
120 DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences); 119 DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences);
121 }; 120 };
122 121
123 #endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_ 122 #endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698