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 197 matching lines @@
       checkbox = button;
       break;
     }
   }
 
   UpdateGalleryCheckbox(checkbox, gallery, permitted);
   UpdateCheckboxContainerFrame();
   [alert_ layout];
 }
 
+void MediaGalleriesDialogCocoa::ForgetGallery(
+    const MediaGalleryPrefInfo* gallery) {
+  NSUInteger index = 0;
+  NSString* unique_id = GetUniqueIDForGallery(gallery);
+
+  for (NSButton* button in checkboxes_.get()) {
+    if ([[[button cell] representedObject] isEqual:unique_id]) {
+      [checkboxes_ removeObjectAtIndex:index];

[sail, 2013/02/08 19:48:22]

Hm.. is this ok to do while the iterator is still alive?
Maybe move the for loop into a helper function? Something like:
  NSButton* checkbox = [self checkboxForID:unique_id];
  [checkboxes_ removeObject:checkbox]

You could then use that method in UpdateGallery() as well.

[Lei Zhang, 2013/02/08 20:48:02]

Done.

BTW, I changed the test to forget the gallery1 instead of gallery2. It seems I
need to do more layout here to make it pass. I'm WFH today, so I am relying on
the unit test and haven't visually confirmed the this issue + fix.

+      UpdateCheckboxContainerFrame();
+      [alert_ layout];
+      return;
+    }
+    ++index;
+  }
+
+}
+
 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