diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 00:22:49 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 00:22:49 +0000 |
commit | 206743c88c222ed96d727da98e16ca19e2aac59e (patch) | |
tree | ac4b0f0247217f1443b58cf6c73fb1621dd2b246 /chrome/browser/cocoa/browser_window_cocoa.mm | |
parent | 20992c72d3c527b34444b1b9c0db01f7d8910aea (diff) | |
download | chromium_src-206743c88c222ed96d727da98e16ca19e2aac59e.zip chromium_src-206743c88c222ed96d727da98e16ca19e2aac59e.tar.gz chromium_src-206743c88c222ed96d727da98e16ca19e2aac59e.tar.bz2 |
Made HtmlDialogWindowController on OS X use its own browser object.
Fixed some style violations.
Made HtmlDialogWindowDelegateBridge stop doing anything after it receives a close notification.
This fixes the crash described in issue 28039.
BUG=28039
TEST=trybots,manual
Review URL: http://codereview.chromium.org/402065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_cocoa.mm')
-rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index eacab5a..a1aff9d 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -318,8 +318,8 @@ void BrowserWindowCocoa::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, parent_window = GetNativeHandle(); } [HtmlDialogWindowController showHtmlDialog:delegate - parentWindow:parent_window - browser:browser_]; + profile:browser_->profile() + parentWindow:parent_window]; } void BrowserWindowCocoa::UserChangedTheme() { |