chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm - Issue 120253002: Set parent for window picker dialog on Mac

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/media_picker/desktop_media_picker_controller.mm

Issue 120253002: Set parent for window picker dialog on Mac (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years 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/media_picker/desktop_media_picker_controller.h ('k') | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

index 31342a6ac73977b35cfb8f21262743ffbea1f247..145ddac91c0123330a3634d667b056b3a5fc4b18 100644

--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

@@ -55,6 +55,7 @@ const int kExcessButtonPadding = 6;

@implementation DesktopMediaPickerController

- (id)initWithMediaList:(scoped_ptr<DesktopMediaList>)media_list

+ parent:(NSWindow*)parent

callback:(const DesktopMediaPicker::DoneCallback&)callback

appName:(const string16&)appName {

const NSUInteger kStyleMask =

@@ -65,6 +66,8 @@ const int kExcessButtonPadding = 6;

backing:NSBackingStoreBuffered

defer:NO]);

+ [parent addChildWindow:window ordered:NSWindowAbove];

Mark Mentovai 2013/12/20 21:26:00 This should be inside the [super initWithWindow:]

Mark Mentovai 2013/12/20 21:26:00 Do you ever want to remove this window from its pa

Sergey Ulanov 2013/12/20 21:40:07 Done.

Sergey Ulanov 2013/12/20 21:40:07 No, I don't think we need to remove it from parent

if ((self = [super initWithWindow:window])) {

[window setDelegate:self];

[self initializeContentsWithAppName:appName];