[MediaGalleries] Context menu for Mac media galleries dialog.

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"
 
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #import "ui/base/cocoa/flipped_view.h"
+#import "ui/base/cocoa/menu_controller.h"
+#import "ui/base/models/menu_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+// Controller for UI events on items in the media galleries dialog.
 @interface MediaGalleriesCocoaController : NSObject {
  @private
   MediaGalleriesDialogCocoa* dialog_;
 }
 
 @property(nonatomic, assign) MediaGalleriesDialogCocoa* dialog;
 
 @end
 
 @implementation MediaGalleriesCocoaController
@@ skipping 13 matching lines @@
   dialog_->OnAddFolderClicked();
 }
 
 - (void)onCheckboxToggled:(id)sender {
   DCHECK(dialog_);
   dialog_->OnCheckboxToggled(sender);
 }
 
 @end
 
+@interface MediaGalleriesCheckbox : NSButton {
+ @private
+  MediaGalleriesDialogCocoa* dialog_;
+  MediaGalleryPrefId prefId_;
+  base::scoped_nsobject<MenuController> menu_controller_;
+}
+
+- (NSMenu*)menuForEvent:(NSEvent*)theEvent;
+
+@end
+
+@implementation MediaGalleriesCheckbox
+
+- (id)initWithFrame:(NSRect)frameRect
+             dialog:(MediaGalleriesDialogCocoa*)dialog
+             prefId:(MediaGalleryPrefId)prefId {
+  if ((self = [super initWithFrame:frameRect])) {
+  }
+  dialog_ = dialog;
+  prefId_ = prefId;

[Avi (use Gerrit), 2013/11/06 18:49:26]

These assignments go in the braces (otherwise you're accessing a nil |self|).

[Greg Billock, 2013/11/06 21:59:24]

Done.

+  return self;
+}
+
+- (NSMenu*)menuForEvent:(NSEvent*)theEvent {
+  menu_controller_.reset(
+    [[MenuController alloc] initWithModel:dialog_->GetContextMenuModel(prefId_)
+                   useWithPopUpButtonCell:NO]);
+  return [menu_controller_ menu];
+}
+
+@end
+
 namespace {
 
 const CGFloat kCheckboxMargin = 10;
 const CGFloat kCheckboxMaxWidth = 440;
 const CGFloat kScrollAreaHeight = 220;
 
 NSString* GetUniqueIDForGallery(const MediaGalleryPrefInfo& gallery) {
   return base::SysUTF8ToNSString(gallery.device_id + gallery.path.value());
 }
 
@@ skipping 218 matching lines @@
       break;
     }
   }
 
 }
 
 void MediaGalleriesDialogCocoa::UpdateGalleryCheckbox(
     const MediaGalleryPrefInfo& gallery,
     bool permitted,
     CGFloat y_pos) {
-  base::scoped_nsobject<NSButton> checkbox(
-      [[NSButton alloc] initWithFrame:NSZeroRect]);
+  base::scoped_nsobject<MediaGalleriesCheckbox> checkbox(
+      [[MediaGalleriesCheckbox alloc] initWithFrame:NSZeroRect
+                                             dialog:this
+                                             prefId:gallery.pref_id]);
   NSString* unique_id = GetUniqueIDForGallery(gallery);
   [[checkbox cell] setRepresentedObject:unique_id];
   [[checkbox cell] setLineBreakMode:NSLineBreakByTruncatingMiddle];
   [checkbox setButtonType:NSSwitchButton];
   [checkbox setTarget:cocoa_controller_];
   [checkbox setAction:@selector(onCheckboxToggled:)];
   [checkboxes_ addObject:checkbox];
 
   // TODO(gbillock): Would be nice to add middle text elide behavior here.
   [checkbox setTitle:base::SysUTF16ToNSString(
@@ skipping 37 matching lines @@
 
 void MediaGalleriesDialogCocoa::UpdateGalleries() {
   InitDialogControls();
 }
 
 void MediaGalleriesDialogCocoa::OnConstrainedWindowClosed(
     ConstrainedWindowMac* window) {
   controller_->DialogFinished(accepted_);
 }
 
+ui::MenuModel* MediaGalleriesDialogCocoa::GetContextMenuModel(
+    MediaGalleryPrefId prefid) {
+  return controller_->GetContextMenuModel(prefid);
+}
+
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller(
       [[MediaGalleriesCocoaController alloc] init]);
   return new MediaGalleriesDialogCocoa(controller, cocoa_controller);
 }