chrome/browser/cocoa/browser_window_cocoa.mm - Issue 344008: Implemented most of HtmlDialogWindowController, which is a Cocoa port

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 344008: Implemented most of HtmlDialogWindowController, which is a Cocoa port (Closed)

Patch Set: Added TODOs. Created 11 years, 2 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:

Index: chrome/browser/cocoa/browser_window_cocoa.mm

diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm

index f48746ea187ead37acbed20cd839566ef0b22d0f..cb84c550ea94293ed06e3e4451a3726a61d1a9bf 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"

@@ -295,7 +296,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() {