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

Unified 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, 5 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/pref_service.h
diff --git a/chrome/browser/pref_service.h b/chrome/browser/pref_service.h
index 255214ad65133902072857691fa2c4262599c0ff..f62876454c3e3bf7e9216b249a759599db1d51b5 100644
--- a/chrome/browser/pref_service.h
+++ b/chrome/browser/pref_service.h
@@ -262,6 +262,7 @@ class PrefService : public NonThreadSafe {
PrefObserverMap pref_observers_;
friend class ScopedPrefUpdate;
+ friend class TestingPrefService;
DISALLOW_COPY_AND_ASSIGN(PrefService);
};
« 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