Cleanup GTK toolbar tooltips. Move from GtkTooltips to GtkTooltip API.

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
@@ skipping 59 matching lines @@
   gtk_widget_set_size_request(toolbar_, -1, kToolbarHeight);
 
   // A GtkAccelGroup is not InitiallyUnowned, meaning we get a real reference
   // count starting at one.  We don't want the lifetime to be managed by the
   // top level window, since the lifetime should be tied to the C++ object.
   // When we add the accelerator group, the window will take a reference, but
   // we still hold on to the original, and thus own a reference to the group.
   accel_group_ = gtk_accel_group_new();
   gtk_window_add_accel_group(top_level_window, accel_group_);
 
-  toolbar_tooltips_ = gtk_tooltips_new();
-
   back_.reset(BuildBackForwardButton(IDR_BACK, IDR_BACK_P, IDR_BACK_H,
               IDR_BACK_D,
               l10n_util::GetString(IDS_TOOLTIP_BACK)));
   AddAcceleratorToButton(back_, GDK_Left, GDK_MOD1_MASK);
   forward_.reset(BuildBackForwardButton(IDR_FORWARD, IDR_FORWARD_P,
                  IDR_FORWARD_H, IDR_FORWARD_D,
                  l10n_util::GetString(IDS_TOOLTIP_FORWARD)));
   AddAcceleratorToButton(forward_, GDK_Right, GDK_MOD1_MASK);
 
   // TODO(estade): These blank labels are kind of ghetto. Padding should be
@@ skipping 110 matching lines @@
                                           bool should_restore_state) {
   location_bar_->Update(should_restore_state ? contents : NULL);
 }
 
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
     const std::wstring& localized_tooltip) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
       highlight_id, depressed_id);
 
-  gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tooltips_),
-                       GTK_WIDGET(button->widget()),
-                       WideToUTF8(localized_tooltip).c_str(),
-                       WideToUTF8(localized_tooltip).c_str());
+  gtk_widget_set_tooltip_text(button->widget(),
+                              WideToUTF8(localized_tooltip).c_str());
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
 CustomContainerButton* BrowserToolbarGtk::BuildToolbarMenuButton(
     int icon_id,
     const std::wstring& localized_tooltip) {
   CustomContainerButton* button = new CustomContainerButton;
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gtk_container_set_border_width(GTK_CONTAINER(button->widget()), 2);
   gtk_container_add(GTK_CONTAINER(button->widget()),
                     gtk_image_new_from_pixbuf(rb.LoadPixbuf(icon_id)));
 
-  gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tooltips_),
-                       GTK_WIDGET(button->widget()),
-                       WideToUTF8(localized_tooltip).c_str(),
-                       WideToUTF8(localized_tooltip).c_str());
+  gtk_widget_set_tooltip_text(button->widget(),
+                              WideToUTF8(localized_tooltip).c_str());
   g_signal_connect(G_OBJECT(button->widget()), "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEvent), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
 
   return button;
 }
 
 // static
@@ skipping 47 matching lines @@
 
 CustomDrawButton* BrowserToolbarGtk::BuildBackForwardButton(
     int normal_id,
     int active_id,
     int highlight_id,
     int depressed_id,
     const std::wstring& localized_tooltip) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
                                                   highlight_id, depressed_id);
 
-  // TODO(erg): Mismatch between wstring and string.
-  // gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tooltips_),
-  //                      GTK_WIDGET(back_),
-  //                      localized_tooltip, localized_tooltip);
+  gtk_widget_set_tooltip_text(button->widget(),
+                              WideToUTF8(localized_tooltip).c_str());
 
   g_signal_connect(G_OBJECT(button->widget()), "button-press-event",
                    G_CALLBACK(OnBackForwardPressEvent), this);
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   // Popup the menu as left-aligned relative to this widget rather than the
   // default of right aligned.
@@ skipping 40 matching lines @@
 }
 
 void BrowserToolbarGtk::RunAppMenu(GdkEvent* button_press_event) {
   app_menu_->Popup(app_menu_button_->widget(), button_press_event);
 }
 
 CustomDrawButton* BrowserToolbarGtk::MakeHomeButton() {
   return BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
                             l10n_util::GetString(IDS_TOOLTIP_HOME));
 }