Chromium Code Reviews| Index: chrome/browser/ui/views/extensions/media_galleries_dialog_views.h |
| diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h |
| index 2eff5123861b1ded10268b9121269920b4f23587..a113d0c6d0832b6b0933cb7ec1407e368d5ac526 100644 |
| --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h |
| +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h |
| @@ -65,20 +65,20 @@ class MediaGalleriesDialogViews : public MediaGalleriesDialog, |
| FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, UpdateAdds); |
| FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes); |
| - typedef std::map<GalleryDialogId, MediaGalleryCheckboxView*> CheckboxMap; |
| + typedef std::map<MediaGalleryPrefId, MediaGalleryCheckboxView*> CheckboxMap; |
| void InitChildViews(); |
| // Adds a checkbox or updates an existing checkbox. Returns true if a new one |
| // was added. |
| bool AddOrUpdateGallery( |
| - const MediaGalleriesDialogController::GalleryPermission& gallery, |
| + const MediaGalleriesDialogController::Entry& gallery, |
| views::View* container, |
| int trailing_vertical_space); |
| void ShowContextMenu(const gfx::Point& point, |
| ui::MenuSourceType source_type, |
| - GalleryDialogId id); |
| + MediaGalleryPrefId id); |
| // Whether |controller_| has a valid WebContents or not. |
| // In unit tests, it may not. |
| @@ -97,7 +97,7 @@ class MediaGalleriesDialogViews : public MediaGalleriesDialog, |
| // Pointer to the button to add a new gallery. Owned by parent in |
|
Lei Zhang
2014/06/05 07:56:25
update comment
vandebo (ex-Chrome)
2014/06/05 19:25:30
Done.
|
| // the dialog views tree. |
| - views::LabelButton* add_gallery_button_; |
| + views::LabelButton* auxilliary_button_; |
| // This tracks whether the confirm button can be clicked. It starts as false |
| // if no checkboxes are ticked. After there is any interaction, or some |