Media Galleries: Update tooltips in permission dialogs when galleries change.

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

 // 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/views/extensions/media_galleries_dialog_views.h"
 
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 90 matching lines @@
   // After adding a new checkbox, we have to update the size of the dialog.
   if (AddOrUpdateGallery(gallery, permitted))
     GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }
 
 bool MediaGalleriesDialogViews::AddOrUpdateGallery(
     const MediaGalleryPrefInfo* gallery,
     bool permitted) {
   string16 label =
       MediaGalleriesDialogController::GetGalleryDisplayName(*gallery);
+  string16 tooltip_text =
+      MediaGalleriesDialogController::GetGalleryTooltip(*gallery);

[Greg Billock, 2013/01/31 23:01:21]

Good. I did this in my change as well. It'll merge nicely.

   CheckboxMap::iterator iter = checkbox_map_.find(gallery);
   if (iter != checkbox_map_.end()) {
     views::Checkbox* checkbox = iter->second;
     checkbox->SetChecked(permitted);
     checkbox->SetText(label);
+    checkbox->SetTooltipText(tooltip_text);
     return false;
   }
 
   views::Checkbox* checkbox = new views::Checkbox(label);
   checkbox->set_listener(this);
-  checkbox->SetTooltipText(
-      MediaGalleriesDialogController::GetGalleryTooltip(*gallery));
+  checkbox->SetTooltipText(tooltip_text);
   checkbox_container_->AddChildView(checkbox);
   checkbox->SetChecked(permitted);
   checkbox_map_[gallery] = checkbox;
 
   return true;
 }
 
 string16 MediaGalleriesDialogViews::GetWindowTitle() const {
   return controller_->GetHeader();
 }
@@ skipping 84 matching lines @@
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }
 
 }  // namespace chrome