Give DisconnectWindow some TLC.

remoting/host/disconnect_window_gtk.cc

 // Copyright (c) 2012 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 "remoting/host/disconnect_window.h"
 
 #include <gtk/gtk.h>
 #include <math.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "remoting/host/ui_strings.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 namespace remoting {
 
 class DisconnectWindowGtk : public DisconnectWindow {
  public:
   DisconnectWindowGtk();
   virtual ~DisconnectWindowGtk();
 
   virtual bool Show(const UiStrings& ui_strings,
-                    const DisconnectCallback& disconnect_callback,
+                    const base::Closure& disconnect_callback,
                     const std::string& username) OVERRIDE;
   virtual void Hide() OVERRIDE;
 
  private:
   CHROMEGTK_CALLBACK_1(DisconnectWindowGtk, gboolean, OnDelete, GdkEvent*);
   CHROMEGTK_CALLBACK_0(DisconnectWindowGtk, void, OnClicked);
   CHROMEGTK_CALLBACK_1(DisconnectWindowGtk, gboolean, OnConfigure,
                        GdkEventConfigure*);
   CHROMEGTK_CALLBACK_1(DisconnectWindowGtk, gboolean, OnButtonPress,
                        GdkEventButton*);
 
   void CreateWindow(const UiStrings& ui_strings);
 
-  DisconnectCallback disconnect_callback_;
+  base::Closure disconnect_callback_;
   GtkWidget* disconnect_window_;
   GtkWidget* message_;
   GtkWidget* button_;
 
   // Used to distinguish resize events from other types of "configure-event"
   // notifications.
   int current_width_;
   int current_height_;
 
   DISALLOW_COPY_AND_ASSIGN(DisconnectWindowGtk);
 };
 
 DisconnectWindowGtk::DisconnectWindowGtk()
     : disconnect_window_(NULL),
       current_width_(0),
       current_height_(0) {
 }
 
 DisconnectWindowGtk::~DisconnectWindowGtk() {
+  Hide();
 }
 
 void DisconnectWindowGtk::CreateWindow(const UiStrings& ui_strings) {
   if (disconnect_window_) return;
 
   disconnect_window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   GtkWindow* window = GTK_WINDOW(disconnect_window_);
 
   g_signal_connect(disconnect_window_, "delete-event",
                    G_CALLBACK(OnDeleteThunk), this);
@@ skipping 53 matching lines @@
   // readable against the window's background pixmap.
   PangoAttrList* attributes = pango_attr_list_new();
   PangoAttribute* text_color = pango_attr_foreground_new(0, 0, 0);
   pango_attr_list_insert(attributes, text_color);
   gtk_label_set_attributes(GTK_LABEL(message_), attributes);
 
   gtk_widget_show_all(disconnect_window_);
 }
 
 bool DisconnectWindowGtk::Show(const UiStrings& ui_strings,
-                               const DisconnectCallback& disconnect_callback,
+                               const base::Closure& disconnect_callback,
                                const std::string& username) {
   DCHECK(disconnect_callback_.is_null());
   DCHECK(!disconnect_callback.is_null());
   DCHECK(!disconnect_window_);
 
   disconnect_callback_ = disconnect_callback;
   CreateWindow(ui_strings);
 
   string16 text = ReplaceStringPlaceholders(
       ui_strings.disconnect_message, UTF8ToUTF16(username), NULL);
@@ skipping 133 matching lines @@
                              event->y_root,
                              event->time);
   return FALSE;
 }
 
 scoped_ptr<DisconnectWindow> DisconnectWindow::Create() {
   return scoped_ptr<DisconnectWindow>(new DisconnectWindowGtk());
 }
 
 }  // namespace remoting