Commit 20106b61 authored by estade@chromium.org's avatar estade@chromium.org

[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
parent b8b01d74
...@@ -115,7 +115,7 @@ void StatusBubbleGtk::Show() { ...@@ -115,7 +115,7 @@ void StatusBubbleGtk::Show() {
// If we were going to hide, stop. // If we were going to hide, stop.
hide_timer_.Stop(); hide_timer_.Stop();
gtk_widget_show_all(container_.get()); gtk_widget_show(container_.get());
if (container_->window) if (container_->window)
gdk_window_raise(container_->window); gdk_window_raise(container_->window);
} }
...@@ -125,7 +125,7 @@ void StatusBubbleGtk::Hide() { ...@@ -125,7 +125,7 @@ void StatusBubbleGtk::Hide() {
expand_timer_.Stop(); expand_timer_.Stop();
expand_animation_.reset(); expand_animation_.reset();
gtk_widget_hide_all(container_.get()); gtk_widget_hide(container_.get());
} }
void StatusBubbleGtk::SetStatusTextTo(const std::string& status_utf8) { void StatusBubbleGtk::SetStatusTextTo(const std::string& status_utf8) {
...@@ -253,6 +253,7 @@ void StatusBubbleGtk::InitWidgets() { ...@@ -253,6 +253,7 @@ void StatusBubbleGtk::InitWidgets() {
kInternalLeftRightPadding + (ltr ? 0 : kCornerSize), kInternalLeftRightPadding + (ltr ? 0 : kCornerSize),
kInternalLeftRightPadding + (ltr ? kCornerSize : 0)); kInternalLeftRightPadding + (ltr ? kCornerSize : 0));
gtk_container_add(GTK_CONTAINER(padding_), label_); gtk_container_add(GTK_CONTAINER(padding_), label_);
gtk_widget_show_all(padding_);
container_.Own(gtk_event_box_new()); container_.Own(gtk_event_box_new());
gtk_widget_set_no_show_all(container_.get(), TRUE); gtk_widget_set_no_show_all(container_.get(), TRUE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment