diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 19:50:29 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 19:50:29 +0000 |
| commit | c4f7dfb44992c8fb9139133107e0ac9200edf241 (patch) | |
| tree | e6ca6cdc567628d3481d96d56e24d58359148631 /chrome/browser/cocoa/browser_window_cocoa.mm | |
| parent | 25e979d39063ea83e0635010a3204aa6ec0b166b (diff) | |
| download | chromium_src-c4f7dfb44992c8fb9139133107e0ac9200edf241.zip chromium_src-c4f7dfb44992c8fb9139133107e0ac9200edf241.tar.gz chromium_src-c4f7dfb44992c8fb9139133107e0ac9200edf241.tar.bz2 | |
Implemented most of HtmlDialogWindowController, which is a Cocoa port
of HtmlDialogView.
Added TODO to fix inaccurate font height metric for OS X font class (and maybe width).
Added the BrowserCommandExecutor protocol so that not just a
BrowserWindowController can be the window controller for a
ChromeEventProcessingWindow.
Added unittests. Also tested manually with the bookmark sync setup
wizard dialog.
BUG=23073
TEST=added unittests, trybot, and manual testing
Review URL: http://codereview.chromium.org/344008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30619 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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index f16c524..e00f73d 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -11,6 +11,7 @@ #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/clear_browsing_data_controller.h" #import "chrome/browser/cocoa/download_shelf_controller.h" +#import "chrome/browser/cocoa/html_dialog_window_controller.h" #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" #import "chrome/browser/cocoa/nsmenuitem_additions.h" #include "chrome/browser/cocoa/page_info_window_mac.h" @@ -296,7 +297,12 @@ void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads() { void BrowserWindowCocoa::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, gfx::NativeWindow parent_window) { - NOTIMPLEMENTED(); + if (!parent_window) { + parent_window = GetNativeHandle(); + } + [HtmlDialogWindowController showHtmlDialog:delegate + parentWindow:parent_window + browser:browser_]; } void BrowserWindowCocoa::UserChangedTheme() { |