chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm - Issue 148093011: Abstract media galleries context menu code and use it in scan result dialog.

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/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

Issue 148093011: Abstract media galleries context menu code and use it in scan result dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nits & rebase Created 6 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h ('k') | chrome/browser/ui/views/extensions/media_galleries_dialog_views.h » ('j') | chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

index a92f70b4d29290cd183b603ae0cfa0c05aabe569..14edb332e1091877da56437ead47a748286e9f2e 100644

--- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

@@ -82,7 +82,7 @@

- (NSMenu*)menuForEvent:(NSEvent*)theEvent {

menu_controller_.reset(

- [[MenuController alloc] initWithModel:dialog_->GetContextMenuModel(prefId_)

+ [[MenuController alloc] initWithModel:dialog_->GetContextMenu(prefId_)

useWithPopUpButtonCell:NO]);

return [menu_controller_ menu];

}

@@ -388,9 +388,9 @@ void MediaGalleriesDialogCocoa::OnConstrainedWindowClosed(

controller_->DialogFinished(accepted_);

}

-ui::MenuModel* MediaGalleriesDialogCocoa::GetContextMenuModel(

+ui::MenuModel* MediaGalleriesDialogCocoa::GetContextMenu(

MediaGalleryPrefId prefid) {

- return controller_->GetContextMenuModel(prefid);

+ return controller_->GetContextMenu(prefid);

}

// static