diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-01 00:41:52 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-01 00:41:52 +0000 |
| commit | 86fda681791b475fb4da0a16a29c44b69f5ec9bf (patch) | |
| tree | 4084d0e20aceab587b1307215abeee3abdb369cd /chrome/browser/gtk/bookmark_bubble_gtk.cc | |
| parent | ec136c7195d187dabf64e1be5c18bb0aaede9794 (diff) | |
| download | chromium_src-86fda681791b475fb4da0a16a29c44b69f5ec9bf.zip chromium_src-86fda681791b475fb4da0a16a29c44b69f5ec9bf.tar.gz chromium_src-86fda681791b475fb4da0a16a29c44b69f5ec9bf.tar.bz2 | |
revert 22226 as it caused some ui test crashes
TBR=nsylvain
Review URL: http://codereview.chromium.org/160491
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bubble_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bubble_gtk.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc index 8e93d77..67c9dc6 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc @@ -118,10 +118,6 @@ void BookmarkBubbleGtk::Observe(NotificationType type, const NotificationDetails& details) { DCHECK(type == NotificationType::BROWSER_THEME_CHANGED); - gtk_chrome_link_button_set_use_gtk_theme( - GTK_CHROME_LINK_BUTTON(remove_button_), - theme_provider_->UseGtkTheme()); - if (theme_provider_->UseGtkTheme()) { for (std::vector<GtkWidget*>::iterator it = labels_.begin(); it != labels_.end(); ++it) { @@ -156,7 +152,7 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* transient_toplevel, newly_bookmarked_ ? IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED : IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK).c_str()); labels_.push_back(label); - remove_button_ = gtk_chrome_link_button_new( + GtkWidget* remove_button = gtk_chrome_link_button_new( l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK).c_str()); GtkWidget* edit_button = gtk_button_new_with_label( l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_OPTIONS).c_str()); @@ -173,7 +169,7 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* transient_toplevel, 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_, + gtk_box_pack_start(GTK_BOX(top), remove_button, FALSE, FALSE, 0); // TODO(deanm): We should show the bookmark bar folder along with the top @@ -230,7 +226,7 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* transient_toplevel, G_CALLBACK(&HandleEditButtonThunk), this); g_signal_connect(close_button, "clicked", G_CALLBACK(&HandleCloseButtonThunk), this); - g_signal_connect(remove_button_, "clicked", + g_signal_connect(remove_button, "clicked", G_CALLBACK(&HandleRemoveButtonThunk), this); registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, |