summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 20:15:04 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 20:15:04 +0000
commitbd0b05d918f505731c18085119ba3362aac71b8a (patch)
tree97d18bcaac202afe4553ee71d09e59b7de863e2c /chrome/browser/extensions
parent617fd0d2382bcdd87fca3d9377cb796bb0924882 (diff)
downloadchromium_src-bd0b05d918f505731c18085119ba3362aac71b8a.zip
chromium_src-bd0b05d918f505731c18085119ba3362aac71b8a.tar.gz
chromium_src-bd0b05d918f505731c18085119ba3362aac71b8a.tar.bz2
GTK: unbreak extension badges.
BUG=50682 TEST=load make_page_red, you can see the badge; dragging still works, clicking still works, removing icons still works Review URL: http://codereview.chromium.org/3064039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/browser_action_test_util_gtk.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/browser_action_test_util_gtk.cc b/chrome/browser/extensions/browser_action_test_util_gtk.cc
index 7761946..8318dce 100644
--- a/chrome/browser/extensions/browser_action_test_util_gtk.cc
+++ b/chrome/browser/extensions/browser_action_test_util_gtk.cc
@@ -15,13 +15,15 @@
namespace {
GtkWidget* GetButton(Browser* browser, int index) {
- GtkWidget* button = NULL;
GtkWidget* toolbar =
ViewIDUtil::GetWidget(GTK_WIDGET(browser->window()->GetNativeHandle()),
VIEW_ID_BROWSER_ACTION_TOOLBAR);
+ GtkWidget* button = NULL;
if (toolbar) {
GList* children = gtk_container_get_children(GTK_CONTAINER(toolbar));
- button = static_cast<GtkWidget*>(g_list_nth(children, index)->data);
+ GtkWidget* alignment =
+ static_cast<GtkWidget*>(g_list_nth(children, index)->data);
+ button = gtk_bin_get_child(GTK_BIN(alignment));
g_list_free(children);
}
return button;