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

Side by Side Diff: chrome/browser/pref_service.h

Issue 3067017: Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
« no previous file with comments | « chrome/browser/managed_prefs_banner_base.cc ('k') | chrome/browser/pref_set_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // This provides a way to access the application's current preferences. 5 // This provides a way to access the application's current preferences.
6 6
7 #ifndef CHROME_BROWSER_PREF_SERVICE_H_ 7 #ifndef CHROME_BROWSER_PREF_SERVICE_H_
8 #define CHROME_BROWSER_PREF_SERVICE_H_ 8 #define CHROME_BROWSER_PREF_SERVICE_H_
9 9
10 #include <set> 10 #include <set>
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 PreferenceSet prefs_; 255 PreferenceSet prefs_;
256 256
257 // A map from pref names to a list of observers. Observers get fired in the 257 // A map from pref names to a list of observers. Observers get fired in the
258 // order they are added. 258 // order they are added.
259 typedef ObserverList<NotificationObserver> NotificationObserverList; 259 typedef ObserverList<NotificationObserver> NotificationObserverList;
260 typedef base::hash_map<std::wstring, NotificationObserverList*> 260 typedef base::hash_map<std::wstring, NotificationObserverList*>
261 PrefObserverMap; 261 PrefObserverMap;
262 PrefObserverMap pref_observers_; 262 PrefObserverMap pref_observers_;
263 263
264 friend class ScopedPrefUpdate; 264 friend class ScopedPrefUpdate;
265 friend class TestingPrefService;
265 266
266 DISALLOW_COPY_AND_ASSIGN(PrefService); 267 DISALLOW_COPY_AND_ASSIGN(PrefService);
267 }; 268 };
268 269
269 #endif // CHROME_BROWSER_PREF_SERVICE_H_ 270 #endif // CHROME_BROWSER_PREF_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/managed_prefs_banner_base.cc ('k') | chrome/browser/pref_set_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698