summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/html_dialog_window_controller.mm
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/cocoa/html_dialog_window_controller.mm')
-rw-r--r--chrome/browser/cocoa/html_dialog_window_controller.mm10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/html_dialog_window_controller.mm b/chrome/browser/cocoa/html_dialog_window_controller.mm
index f2b79ea..32b2096 100644
--- a/chrome/browser/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/cocoa/html_dialog_window_controller.mm
@@ -72,8 +72,9 @@ private:
namespace html_dialog_window_controller {
-void ShowHtmlDialog(HtmlDialogUIDelegate* delegate, Profile* profile) {
- [HtmlDialogWindowController showHtmlDialog:delegate profile:profile];
+gfx::NativeWindow ShowHtmlDialog(
+ HtmlDialogUIDelegate* delegate, Profile* profile) {
+ return [HtmlDialogWindowController showHtmlDialog:delegate profile:profile];
}
} // namespace html_dialog_window_controller
@@ -217,13 +218,14 @@ void HtmlDialogWindowDelegateBridge::HandleKeyboardEvent(
// NOTE(akalin): We'll probably have to add the parentWindow parameter back
// in once we implement modal dialogs.
-+ (void)showHtmlDialog:(HtmlDialogUIDelegate*)delegate
- profile:(Profile*)profile {
++ (NSWindow*)showHtmlDialog:(HtmlDialogUIDelegate*)delegate
+ profile:(Profile*)profile {
HtmlDialogWindowController* htmlDialogWindowController =
[[HtmlDialogWindowController alloc] initWithDelegate:delegate
profile:profile];
[htmlDialogWindowController loadDialogContents];
[htmlDialogWindowController showWindow:nil];
+ return [htmlDialogWindowController window];
}
- (id)initWithDelegate:(HtmlDialogUIDelegate*)delegate