diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 22:02:57 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 22:02:57 +0000 |
| commit | 753e9197e646adb1904e5d564a66454ea22a270b (patch) | |
| tree | 1620e592fa8fa457be882529b77179220bc2bf52 /chrome/browser/cocoa | |
| parent | d3038f1e9f975349122113151fdb29c04571c793 (diff) | |
| download | chromium_src-753e9197e646adb1904e5d564a66454ea22a270b.zip chromium_src-753e9197e646adb1904e5d564a66454ea22a270b.tar.gz chromium_src-753e9197e646adb1904e5d564a66454ea22a270b.tar.bz2 | |
[Mac] Fix a bunch of crahes related to opening preferences from an incognito window
BUG=32827
TEST=Open incognito window. Wrench menu --> Preferences --> Basics --> Manage. Don't crash.
Review URL: http://codereview.chromium.org/545177
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index b60868c..50f49cf 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -417,7 +417,7 @@ class PrefObserverBridge : public NotificationObserver, pathForResource:@"Preferences" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { - profile_ = profile; + profile_ = profile->GetOriginalProfile(); initialPage_ = initialPage; prefs_ = profile->GetPrefs(); DCHECK(prefs_); |