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

Unified Diff: chrome/browser/ui/cocoa/options/preferences_window_controller.h

Issue 6292017: Extended: Add "system" URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Next iteration Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/options/preferences_window_controller.h
diff --git a/chrome/browser/ui/cocoa/options/preferences_window_controller.h b/chrome/browser/ui/cocoa/options/preferences_window_controller.h
index 3815beb68424f39d86957f883dc963441a9c75e5..39946185e1c18aa1c20e1320580b0e6078c18d69 100644
--- a/chrome/browser/ui/cocoa/options/preferences_window_controller.h
+++ b/chrome/browser/ui/cocoa/options/preferences_window_controller.h
@@ -42,6 +42,7 @@ class ProfileSyncService;
Profile* profile_; // weak ref
OptionsPage initialPage_;
PrefService* prefs_; // weak ref - Obtained from profile_ for convenience.
+ PrefService* local_state_; // weak ref - Obtained from TestingProfile or NULL.
// weak ref - Also obtained from profile_ for convenience. May be NULL.
ProfileSyncService* syncService_;
scoped_ptr<PreferencesWindowControllerInternal::PrefObserverBridge>
@@ -165,6 +166,10 @@ class ProfileSyncService;
@property(nonatomic) BOOL metricsReportingEnabled;
@property(nonatomic) BOOL proxiesConfigureButtonEnabled;
+// Designated for testing. |profile| should not be NULL.
+- (id)initWithProfile:(Profile*)profile localState:(PrefService*)local_state
+ initialPage:(OptionsPage)initialPage;
+
// Designated initializer. |profile| should not be NULL.
- (id)initWithProfile:(Profile*)profile initialPage:(OptionsPage)initialPage;

Powered by Google App Engine
This is Rietveld 408576698