Chromoting: the Me2me host now presents a notification on the console allowing a user to disconnect…

remoting/host/disconnect_window_linux.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/chromoting_host.h"
 #include "remoting/host/ui_strings.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 namespace remoting {
 
 class DisconnectWindowLinux : public DisconnectWindow {
  public:
   DisconnectWindowLinux();
   virtual ~DisconnectWindowLinux();
 
   virtual void Show(ChromotingHost* host,
+                    const DisconnectCallback& disconnect_callback,
                     const std::string& username) OVERRIDE;
   virtual void Hide() OVERRIDE;
 
  private:
   CHROMEGTK_CALLBACK_1(DisconnectWindowLinux, gboolean, OnDelete, GdkEvent*);
   CHROMEGTK_CALLBACK_0(DisconnectWindowLinux, void, OnClicked);
   CHROMEGTK_CALLBACK_1(DisconnectWindowLinux, gboolean, OnConfigure,
                        GdkEventConfigure*);
   CHROMEGTK_CALLBACK_1(DisconnectWindowLinux, gboolean, OnButtonPress,
                        GdkEventButton*);
 
   void CreateWindow(const UiStrings& ui_strings);
 
-  ChromotingHost* host_;
+  DisconnectCallback 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(DisconnectWindowLinux);
 };
 
 DisconnectWindowLinux::DisconnectWindowLinux()
-    : host_(NULL),
-      disconnect_window_(NULL),
+    : disconnect_window_(NULL),
       current_width_(0),
       current_height_(0) {
 }
 
 DisconnectWindowLinux::~DisconnectWindowLinux() {
 }
 
 void DisconnectWindowLinux::CreateWindow(const UiStrings& ui_strings) {
   if (disconnect_window_) return;
 
@@ skipping 58 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_);
 }
 
 void DisconnectWindowLinux::Show(ChromotingHost* host,
+                                 const DisconnectCallback& disconnect_callback,
                                  const std::string& username) {
-  host_ = host;
+  disconnect_callback_ = disconnect_callback;
   CreateWindow(host->ui_strings());
 
   string16 text = ReplaceStringPlaceholders(
       host->ui_strings().disconnect_message, UTF8ToUTF16(username), NULL);
   gtk_label_set_text(GTK_LABEL(message_), UTF16ToUTF8(text).c_str());
   gtk_window_present(GTK_WINDOW(disconnect_window_));
 }
 
 void DisconnectWindowLinux::Hide() {
   if (disconnect_window_) {
     gtk_widget_destroy(disconnect_window_);
     disconnect_window_ = NULL;
   }
 }
 
 void DisconnectWindowLinux::OnClicked(GtkWidget* button) {
-  CHECK(host_);
+  CHECK(!disconnect_callback_.is_null());
 
-  host_->Shutdown(base::Closure());
+  disconnect_callback_.Run();
   Hide();
 }
 
 gboolean DisconnectWindowLinux::OnDelete(GtkWidget* window, GdkEvent* event) {
-  CHECK(host_);
+  CHECK(!disconnect_callback_.is_null());
 
-  host_->Shutdown(base::Closure());
+  disconnect_callback_.Run();
   Hide();
 
   return TRUE;
 }
 
 namespace {
 // Helper function for creating a rectangular path with rounded corners, as
 // Cairo doesn't have this facility.  |radius| is the arc-radius of each
 // corner.  The bounding rectangle extends from (0, 0) to (width, height).
 void AddRoundRectPath(cairo_t* cairo_context, int width, int height,
@@ skipping 102 matching lines @@
                              event->y_root,
                              event->time);
   return FALSE;
 }
 
 scoped_ptr<DisconnectWindow> DisconnectWindow::Create() {
   return scoped_ptr<DisconnectWindow>(new DisconnectWindowLinux());
 }
 
 }  // namespace remoting