bookmarks: Convert "Remove" link into a LabelButton.

chrome/browser/ui/gtk/bookmarks/bookmark_bubble_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/bookmarks/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 93 matching lines @@
       bubble_(NULL),
       factory_(this),
       newly_bookmarked_(newly_bookmarked),
       apply_edits_(true),
       remove_bookmark_(false) {
   GtkWidget* label = gtk_label_new(l10n_util::GetStringUTF8(
       newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED :
                           IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK).c_str());
   labels_.push_back(label);
   remove_button_ = theme_service_->BuildChromeLinkButton(
-      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK));
+      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_REMOVE_BUTTON));
   GtkWidget* edit_button = gtk_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_OPTIONS).c_str());
+      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_EDIT_BUTTON).c_str());
   GtkWidget* close_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_DONE).c_str());
 
   // Our content is arranged in 3 rows.  |top| contains a left justified
   // message, and a right justified remove link button.  |table| is the middle
   // portion with the name entry and the folder combo.  |bottom| is the final
   // row with a spacer, and the edit... and close buttons on the right.
   GtkWidget* content = gtk_vbox_new(FALSE, 5);
   gtk_container_set_border_width(GTK_CONTAINER(content),
                                  ui::kContentAreaBorder);
   GtkWidget* top = gtk_hbox_new(FALSE, 0);
 
   gtk_misc_set_alignment(GTK_MISC(label), 0, 1);
   gtk_box_pack_start(GTK_BOX(top), label,
                      TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(top), remove_button_,
                      FALSE, FALSE, 0);
 
   InitFolderComboModel();
 
   // Create the edit entry for updating the bookmark name / title.
   name_entry_ = gtk_entry_new();
   gtk_entry_set_text(GTK_ENTRY(name_entry_), GetTitle().c_str());
 
   // We use a table to allow the labels to line up with each other, along
   // with the entry and folder combo lining up.
   GtkWidget* table = gtk_util::CreateLabeledControlsGroup(
       &labels_,
-      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_TITLE_TEXT).c_str(),
+      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_NAME_LABEL).c_str(),
       name_entry_,
-      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_FOLDER_TEXT).c_str(),
+      l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_FOLDER_LABEL).c_str(),
       folder_combo_,
       NULL);
 
   GtkWidget* bottom = gtk_hbox_new(FALSE, 0);
   // We want the buttons on the right, so just use an expanding label to fill
   // all of the extra space on the right.
   gtk_box_pack_start(GTK_BOX(bottom), gtk_label_new(""),
                      TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(bottom), edit_button,
                      FALSE, FALSE, 4);
@@ skipping 175 matching lines @@
   gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(folder_combo_),
                                        IsSeparator, NULL, NULL);
   g_object_unref(store);
 
   GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
   gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(folder_combo_), renderer, TRUE);
   gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(folder_combo_), renderer,
                                  "text", COLUMN_NAME,
                                  NULL);
 }