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

Unified Diff: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

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/views/extensions/media_galleries_dialog_views.cc
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
index 67fa70360df4700a0774dd0364d097074f371de3..40ac334f3621d6beaa30ec1fae2253a7f31acc39 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -184,17 +184,15 @@ bool MediaGalleriesDialogViews::AddOrUpdateGallery(
const MediaGalleriesDialogController::Entry& gallery,
views::View* container,
int trailing_vertical_space) {
- base::string16 label = gallery.pref_info.GetGalleryDisplayName();
- base::string16 tooltip_text = gallery.pref_info.GetGalleryTooltip();
- base::string16 details = gallery.pref_info.GetGalleryAdditionalDetails();
bool show_folder_viewer = controller_->ShouldShowFolderViewer(gallery);
CheckboxMap::iterator iter = checkbox_map_.find(gallery.pref_info.pref_id);
if (iter != checkbox_map_.end()) {
views::Checkbox* checkbox = iter->second->checkbox();
checkbox->SetChecked(gallery.selected);
- checkbox->SetText(label);
- checkbox->SetTooltipText(tooltip_text);
+ checkbox->SetText(gallery.pref_info.GetGalleryDisplayName());
+ checkbox->SetTooltipText(gallery.pref_info.GetGalleryTooltip());
+ base::string16 details = gallery.pref_info.GetGalleryAdditionalDetails();
iter->second->secondary_text()->SetText(details);
iter->second->secondary_text()->SetVisible(details.length() > 0);
iter->second->folder_viewer_button()->SetVisible(show_folder_viewer);
@@ -202,9 +200,8 @@ bool MediaGalleriesDialogViews::AddOrUpdateGallery(
}
MediaGalleryCheckboxView* gallery_view =
- new MediaGalleryCheckboxView(label, tooltip_text, details,
- show_folder_viewer, trailing_vertical_space,
- this, this);
+ new MediaGalleryCheckboxView(gallery.pref_info, show_folder_viewer,
+ trailing_vertical_space, this, this);
gallery_view->checkbox()->SetChecked(gallery.selected);
container->AddChildView(gallery_view);
checkbox_map_[gallery.pref_info.pref_id] = gallery_view;

Powered by Google App Engine
This is Rietveld 408576698