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

chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.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/gtk/extensions/media_galleries_dialog_gtk.h"
 
 #include "base/auto_reset.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ skipping 83 matching lines @@
 void MediaGalleriesDialogGtk::UpdateGallery(
     const MediaGalleryPrefInfo* gallery,
     bool permitted) {
   CheckboxMap::iterator iter = checkbox_map_.find(gallery);
 
   GtkWidget* widget = NULL;
   if (iter != checkbox_map_.end()) {
     widget = iter->second;
   } else {
     widget = gtk_check_button_new();
-    gtk_widget_set_tooltip_text(widget, UTF16ToUTF8(
-        MediaGalleriesDialogController::GetGalleryTooltip(*gallery)).c_str());
     g_signal_connect(widget, "toggled", G_CALLBACK(OnToggledThunk), this);
     gtk_box_pack_start(GTK_BOX(checkbox_container_), widget, FALSE, FALSE, 0);
     gtk_widget_show(widget);
     checkbox_map_[gallery] = widget;
   }
 
+  gtk_widget_set_tooltip_text(widget, UTF16ToUTF8(
+      MediaGalleriesDialogController::GetGalleryTooltip(*gallery)).c_str());
+
   base::AutoReset<bool> reset(&ignore_toggles_, true);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), permitted);
   std::string label_text = UTF16ToUTF8(
       MediaGalleriesDialogController::GetGalleryDisplayName(*gallery));
   gtk_button_set_label(GTK_BUTTON(widget), label_text.c_str());
 }
 
 GtkWidget* MediaGalleriesDialogGtk::GetWidgetRoot() {
   return contents_.get();
 }
 
 GtkWidget* MediaGalleriesDialogGtk::GetFocusWidget() {
   return confirm_;
 }
 
 void MediaGalleriesDialogGtk::DeleteDelegate() {
   controller_->DialogFinished(accepted_);
 }
 
 void MediaGalleriesDialogGtk::OnToggled(GtkWidget* widget) {
   if (confirm_)
     gtk_widget_set_sensitive(confirm_, TRUE);
 
   if (ignore_toggles_)
     return;
 
-  for (CheckboxMap::iterator iter = checkbox_map_.begin();
+  for (CheckboxMap::const_iterator iter = checkbox_map_.begin();
        iter != checkbox_map_.end(); ++iter) {
     if (iter->second == widget) {
       controller_->DidToggleGallery(
           iter->first, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
       return;
     }
   }
 
   NOTREACHED();
   return;
@@ skipping 14 matching lines @@
 
 // MediaGalleriesDialogController ----------------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogGtk(controller);
 }
 
 }  // namespace chrome