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

Unified Diff: chrome/browser/cocoa/preferences_window_controller.mm

Issue 2836073: [Mac] Fix a crashing PreferencesWindowController unit test (only crashes in b... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/preferences_window_controller.mm
===================================================================
--- chrome/browser/cocoa/preferences_window_controller.mm (revision 53956)
+++ chrome/browser/cocoa/preferences_window_controller.mm (working copy)
@@ -392,8 +392,9 @@
explicit ManagedPrefsBannerState(PreferencesWindowController* controller,
OptionsPage page,
+ PrefService* local_state,
PrefService* prefs)
- : ManagedPrefsBannerBase(prefs, page),
+ : ManagedPrefsBannerBase(local_state, prefs, page),
controller_(controller),
page_(page) { }
@@ -1960,9 +1961,16 @@
// preferences relevant to the given options |page|.
- (void)initBannerStateForPage:(OptionsPage)page {
page = [self normalizePage:page];
+
+ // During unit tests, there is no local state object, so we fall back to
+ // the prefs object (where we've explicitly registered this pref so we
+ // know it's there).
+ PrefService* local = g_browser_process->local_state();
+ if (!local)
+ local = prefs_;
bannerState_.reset(
new PreferencesWindowControllerInternal::ManagedPrefsBannerState(
- self, page, prefs_));
+ self, page, local, prefs_));
}
- (void)switchToPage:(OptionsPage)page animate:(BOOL)animate {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698