| Index: chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm b/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm
|
| index 925b24fc4e7638a57093d6aeb6a52ee60ab8c9dd..1e5661f9d876f0e0578fd22007d0498de1d50a9c 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm
|
| @@ -62,8 +62,7 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
|
|
|
| - (id)initWithFrame:(NSRect)frameRect
|
| controller:(MediaGalleryListEntryController*)controller
|
| - prefInfo:(const MediaGalleryPrefInfo&)prefInfo
|
| - showFolderViewer:(bool)showFolderViewer {
|
| + prefInfo:(const MediaGalleryPrefInfo&)prefInfo {
|
| if ((self = [super initWithFrame:frameRect])) {
|
| controller_ = controller;
|
| prefId_ = prefInfo.pref_id;
|
| @@ -87,24 +86,6 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
|
| [checkbox_ setToolTip:nsTooltip];
|
| [self addSubview:checkbox_];
|
|
|
| - // Folder viewer button.
|
| - if (showFolderViewer) {
|
| - folderViewer_.reset(
|
| - [[MediaGalleryButton alloc] initWithFrame:NSZeroRect
|
| - controller:self]);
|
| - [folderViewer_ setButtonType:NSMomentaryChangeButton];
|
| - [folderViewer_ setTarget:self];
|
| - [folderViewer_ setAction:@selector(onFolderViewerClicked:)];
|
| -
|
| - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| - [folderViewer_ setImage:rb.GetNativeImageNamed(
|
| - IDR_FILE_FOLDER).ToNSImage()];
|
| - [folderViewer_ setTitle:nil];
|
| - [folderViewer_ setBordered:false];
|
| - [folderViewer_ setToolTip:nsTooltip];
|
| - [self addSubview:folderViewer_];
|
| - }
|
| -
|
| // Additional details text.
|
| base::string16 subscript = prefInfo.GetGalleryAdditionalDetails();
|
| if (!subscript.empty()) {
|
| @@ -164,7 +145,6 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
|
| bounds.size = NSMakeSize(10000, 10000);
|
|
|
| [checkbox_ sizeToFit];
|
| - [folderViewer_ sizeToFit];
|
| [details_ sizeToFit];
|
|
|
| // Auto size everything and lay it out horizontally.
|
| @@ -197,11 +177,6 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
|
| if (overflow > 0) {
|
| checkboxFrame.size.width -= overflow;
|
| [checkbox_ setFrameSize:checkboxFrame.size];
|
| - if (folderViewer_.get()) {
|
| - NSRect folderViewerFrame = [folderViewer_ frame];
|
| - folderViewerFrame.origin.x -= overflow;
|
| - [folderViewer_ setFrameOrigin:folderViewerFrame.origin];
|
| - }
|
| if (details_.get()) {
|
| detailsFrame.origin.x -= overflow;
|
| [details_ setFrameOrigin:detailsFrame.origin];
|
|
|