summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/bookmark_bubble_gtk.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 00:21:57 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 00:21:57 +0000
commit54211c3efb9d4a9b47f3369bdc9f95827e39465e (patch)
tree1dc9c9f18e3b7a369651ab082c2fee9b323621d9 /chrome/browser/gtk/bookmark_bubble_gtk.cc
parentb2b462c79bd4365c76ec90dd74f15ea4e8252638 (diff)
downloadchromium_src-54211c3efb9d4a9b47f3369bdc9f95827e39465e.zip
chromium_src-54211c3efb9d4a9b47f3369bdc9f95827e39465e.tar.gz
chromium_src-54211c3efb9d4a9b47f3369bdc9f95827e39465e.tar.bz2
Add helper for creating table of labeled controls.
BUG=none Review URL: http://codereview.chromium.org/118489 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bubble_gtk.cc')
-rw-r--r--chrome/browser/gtk/bookmark_bubble_gtk.cc26
1 files changed, 7 insertions, 19 deletions
diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc
index adf0874..b875f4f 100644
--- a/chrome/browser/gtk/bookmark_bubble_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/gtk/info_bubble_gtk.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/profile.h"
+#include "chrome/common/gtk_util.h"
#include "grit/generated_resources.h"
namespace {
@@ -119,10 +120,6 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* transient_toplevel,
IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK).c_str());
GtkWidget* remove_button = gtk_chrome_link_button_new(
l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK).c_str());
- GtkWidget* name_label = gtk_label_new(
- l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_TITLE_TEXT).c_str());
- GtkWidget* folder_label = gtk_label_new(
- l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_FOLDER_TEXT).c_str());
GtkWidget* edit_button = gtk_button_new_with_label(
l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_OPTIONS).c_str());
GtkWidget* close_button = gtk_button_new_with_label(
@@ -154,21 +151,12 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* transient_toplevel,
// 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_table_new(2, 2, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 5);
- gtk_table_set_col_spacings(GTK_TABLE(table), 10);
- gtk_table_attach_defaults(GTK_TABLE(table),
- name_label,
- 0, 1, 0, 1);
- gtk_table_attach_defaults(GTK_TABLE(table),
- name_entry_,
- 1, 2, 0, 1);
- gtk_table_attach_defaults(GTK_TABLE(table),
- folder_label,
- 0, 1, 1, 2);
- gtk_table_attach_defaults(GTK_TABLE(table),
- folder_combo_,
- 1, 2, 1, 2);
+ GtkWidget* table = gtk_util::CreateLabeledControlsGroup(
+ l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_TITLE_TEXT).c_str(),
+ name_entry_,
+ l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_FOLDER_TEXT).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