Set parent for window picker dialog on Mac

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
 
 #include "base/bind.h"
 #import "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"
@@ skipping 37 matching lines @@
 
 // Action handlers.
 - (void)okPressed:(id)sender;
 - (void)cancelPressed:(id)sender;
 
 @end
 
 @implementation DesktopMediaPickerController
 
 - (id)initWithMediaList:(scoped_ptr<DesktopMediaList>)media_list
+                 parent:(NSWindow*)parent
                callback:(const DesktopMediaPicker::DoneCallback&)callback
                 appName:(const string16&)appName {
   const NSUInteger kStyleMask =
       NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;

[Mark Mentovai, 2013/12/20 21:26:00]

Is this correct now that you might be creating a child window (if parent is
non-nil)?

[Sergey Ulanov, 2013/12/20 21:40:07]

I think it's still correct.

   base::scoped_nsobject<NSWindow> window(
       [[NSWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater
                                   styleMask:kStyleMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
 
+  [parent addChildWindow:window ordered:NSWindowAbove];

[Mark Mentovai, 2013/12/20 21:26:00]

This should be inside the [super initWithWindow:] block below. If that fails,
|window| used to go out of scope and be deleted. The way you have it written
now, the parent window will still have a reference to a child window without a
controller.

[Mark Mentovai, 2013/12/20 21:26:00]

Do you ever want to remove this window from its parent? [[[self window]
parentWindow] removeChildWindow:self] somewhere?

[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 anywhere.

+
   if ((self = [super initWithWindow:window])) {
     [window setDelegate:self];
     [self initializeContentsWithAppName:appName];
     media_list_ = media_list.Pass();
     media_list_->SetViewDialogWindowId([window windowNumber]);
     doneCallback_ = callback;
     items_.reset([[NSMutableArray alloc] init]);
     bridge_.reset(new DesktopMediaPickerBridge(self));
   }
   return self;
@@ skipping 209 matching lines @@
 - (void)sourceThumbnailChangedAtIndex:(int)index {
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail);
 
   DesktopMediaPickerItem* item = [items_ objectAtIndex:index];
   [item setImageRepresentation:image];
   [sourceBrowser_ reloadData];
 }
 
 @end  // @interface DesktopMediaPickerController