[linux] When the user has the notification options menu, delay system-initiat...

chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/notifications/balloon_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
@@ skipping 84 matching lines @@
 const char* kLabelMarkup = "<span size=\"small\" color=\"%s\">%s</span>";
 
 }  // namespace
 
 BalloonViewImpl::BalloonViewImpl(BalloonCollection* collection)
     : balloon_(NULL),
       frame_container_(NULL),
       html_container_(NULL),
       method_factory_(this),
       close_button_(NULL),
-      animation_(NULL) {
+      animation_(NULL),
+      menu_showing_(false),
+      pending_close_(false) {
 }
 
 BalloonViewImpl::~BalloonViewImpl() {
 }
 
 void BalloonViewImpl::Close(bool by_user) {
-  MessageLoop::current()->PostTask(FROM_HERE,
-      method_factory_.NewRunnableMethod(
-          &BalloonViewImpl::DelayedClose, by_user));
+  // Delay a system-initiated close if the menu is showing.
+  if (!by_user && menu_showing_) {
+    pending_close_ = true;
+  } else {
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        method_factory_.NewRunnableMethod(
+            &BalloonViewImpl::DelayedClose, by_user));
+  }
 }
 
 gfx::Size BalloonViewImpl::GetSize() const {
   // BalloonView has no size if it hasn't been shown yet (which is when
   // balloon_ is set).
   if (!balloon_)
     return gfx::Size();
 
   // Although this may not be the instantaneous size of the balloon if
   // called in the middle of an animation, it is the effective size that
@@ skipping 285 matching lines @@
   cairo_set_source_rgb(cr, kDividerLineColorR,
                        kDividerLineColorG, kDividerLineColorB);
   cairo_stroke(cr);
 
   cairo_destroy(cr);
 
   return FALSE;
 }
 
 void BalloonViewImpl::OnOptionsMenuButton(GtkWidget* widget) {
+  menu_showing_ = true;
   options_menu_->PopupAsContext(gtk_get_current_event_time());
 }
 
+// Called when the menu stops showing.
+void BalloonViewImpl::StoppedShowing() {
+  if (pending_close_)
+    DelayedClose(false);
+  menu_showing_ = false;
+}
+
 gboolean BalloonViewImpl::OnDestroy(GtkWidget* widget) {
   frame_container_ = NULL;
   Close(false);
   return FALSE;  // Propagate.
 }