Media Galleries: Keep media gallery permission dialogs in sync with the gallery

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/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
@@ skipping 135 matching lines @@
        iter != permissions.rend(); iter++) {
     const MediaGalleryPrefInfo* gallery = &iter->second.pref_info;
     NSString* unique_id = GetUniqueIDForGallery(gallery);
     if ([[[checkbox cell] representedObject] isEqual:unique_id]) {
       controller_->DidToggleGallery(gallery, [checkbox state] == NSOnState);
       break;
     }
   }
 }
 
+NSButton* MediaGalleriesDialogCocoa::CheckboxForGallery(
+    const MediaGalleryPrefInfo* gallery) {
+  NSString* unique_id = GetUniqueIDForGallery(gallery);
+  for (NSButton* button in checkboxes_.get()) {
+    if ([[[button cell] representedObject] isEqual:unique_id])
+      return button;
+  }
+  return nil;
+}
+
 void MediaGalleriesDialogCocoa::UpdateGalleryCheckbox(
     NSButton* checkbox,
     const MediaGalleryPrefInfo* gallery,
     bool permitted) {
   CGFloat y_pos = 0;
   if (checkbox) {
     y_pos = NSMinY([checkbox frame]);
   } else {
     if ([checkboxes_ count] > 0)
       y_pos = NSMaxY([[checkboxes_ lastObject] frame]) + kCheckboxMargin;
@@ skipping 27 matching lines @@
 
 void MediaGalleriesDialogCocoa::UpdateCheckboxContainerFrame() {
   NSRect rect = NSMakeRect(
       0, 0, kCheckboxMaxWidth, NSMaxY([[checkboxes_ lastObject] frame]));
   [checkbox_container_ setFrame:rect];
 }
 
 void MediaGalleriesDialogCocoa::UpdateGallery(
     const MediaGalleryPrefInfo* gallery,
     bool permitted) {
-  NSButton* checkbox = nil;
-  NSString* unique_id = GetUniqueIDForGallery(gallery);
-
-  for (NSButton* button in checkboxes_.get()) {
-    if ([[[button cell] representedObject] isEqual:unique_id]) {
-      checkbox = button;
-      break;
-    }
-  }
-
+  NSButton* checkbox = CheckboxForGallery(gallery);
   UpdateGalleryCheckbox(checkbox, gallery, permitted);
   UpdateCheckboxContainerFrame();
   [alert_ layout];
 }
+
+void MediaGalleriesDialogCocoa::ForgetGallery(
+    const MediaGalleryPrefInfo* gallery) {
+  NSButton* checkbox = CheckboxForGallery(gallery);
+  if (!checkbox)
+    return;
+
+  // Remove checkbox and reposition the entries below it.
+  NSUInteger i = [checkboxes_ indexOfObject:checkbox];
+  [checkboxes_ removeObjectAtIndex:i];
+  for (; i < [checkboxes_ count]; ++i) {
+    CGFloat y_pos = 0;
+    if (i > 0) {
+      y_pos = NSMaxY([[checkboxes_ objectAtIndex:i - 1] frame]) +
+          kCheckboxMargin;
+    }
+    checkbox = [checkboxes_ objectAtIndex:i];
+    NSRect rect = [checkbox bounds];
+    rect.origin.y = y_pos;
+    [checkbox setFrame:rect];
+  }
+  UpdateCheckboxContainerFrame();
+  [alert_ layout];
+}
 
 void MediaGalleriesDialogCocoa::OnConstrainedWindowClosed(
     ConstrainedWindowMac* window) {
   controller_->DialogFinished(accepted_);
 }
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller(
       [[MediaGalleriesCocoaController alloc] init]);
   return new MediaGalleriesDialogCocoa(controller, cocoa_controller);
 }
 
 }  // namespace chrome