Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7675)

Unified Diff: chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm

Issue 323093007: Clean up interface to media gallery list entry view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
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 bd98f4b442a5c2e02c57a6714f393d6628a581c3..da39845673e5be796756cc57ccdb3dd8c906c1ea 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,16 +62,14 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
- (id)initWithFrame:(NSRect)frameRect
controller:(MediaGalleryListEntryController*)controller
- prefId:(MediaGalleryPrefId)prefId
- galleryName:(base::string16)galleryName
- subscript:(base::string16)subscript
- tooltip:(base::string16)tooltip
+ prefInfo:(const MediaGalleryPrefInfo&)prefInfo
showFolderViewer:(bool)showFolderViewer {
if ((self = [super initWithFrame:frameRect])) {
controller_ = controller;
- prefId_ = prefId;
+ prefId_ = prefInfo.pref_id;
- NSString* nsTooltip = base::SysUTF16ToNSString(tooltip);
+ NSString* nsTooltip =
+ base::SysUTF16ToNSString(prefInfo.GetGalleryTooltip());
// Set a auto resize mask so that -resizeWithOldSuperviewSize: is called.
// It is overridden so the particular mask doesn't matter.
@@ -84,7 +82,8 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
[checkbox_ setTarget:self];
[checkbox_ setAction:@selector(onCheckboxToggled:)];
- [checkbox_ setTitle:base::SysUTF16ToNSString(galleryName)];
+ [checkbox_ setTitle:
+ base::SysUTF16ToNSString(prefInfo.GetGalleryDisplayName())];
[checkbox_ setToolTip:nsTooltip];
[self addSubview:checkbox_];
@@ -107,6 +106,7 @@ ui::MenuModel* MediaGalleryListEntryController::GetContextMenu(
}
// Additional details text.
+ base::string16 subscript = prefInfo.GetGalleryAdditionalDetails();
if (!subscript.empty()) {
details_.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
[[details_ cell] setLineBreakMode:NSLineBreakByTruncatingHead];

Powered by Google App Engine
This is Rietveld 408576698