summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 20:02:27 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 20:02:27 +0000
commit20106b615c3d11637864fcd4dd4de3356c858f2c (patch)
tree4c090578a73e1d74038c32844dc0355d39466bfd
parentb8b01d7474425928c51579ca8de7851d84871169 (diff)
downloadchromium_src-20106b615c3d11637864fcd4dd4de3356c858f2c.zip
chromium_src-20106b615c3d11637864fcd4dd4de3356c858f2c.tar.gz
chromium_src-20106b615c3d11637864fcd4dd4de3356c858f2c.tar.bz2
[gtk] un-break status bubble.
broken in r71858. BUG=70244 TEST=manual (in and out of --kiosk) Review URL: http://codereview.chromium.org/6343003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71988 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/gtk/status_bubble_gtk.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc
index 79e6073..7f2dccb 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc
@@ -115,7 +115,7 @@ void StatusBubbleGtk::Show() {
// If we were going to hide, stop.
hide_timer_.Stop();
- gtk_widget_show_all(container_.get());
+ gtk_widget_show(container_.get());
if (container_->window)
gdk_window_raise(container_->window);
}
@@ -125,7 +125,7 @@ void StatusBubbleGtk::Hide() {
expand_timer_.Stop();
expand_animation_.reset();
- gtk_widget_hide_all(container_.get());
+ gtk_widget_hide(container_.get());
}
void StatusBubbleGtk::SetStatusTextTo(const std::string& status_utf8) {
@@ -253,6 +253,7 @@ void StatusBubbleGtk::InitWidgets() {
kInternalLeftRightPadding + (ltr ? 0 : kCornerSize),
kInternalLeftRightPadding + (ltr ? kCornerSize : 0));
gtk_container_add(GTK_CONTAINER(padding_), label_);
+ gtk_widget_show_all(padding_);
container_.Own(gtk_event_box_new());
gtk_widget_set_no_show_all(container_.get(), TRUE);