Turned UiStrings into a singleton so that the continue window does not depend on ChromotingHost.

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();
+  explicit DisconnectWindowGtk(const UiStrings* ui_strings);
   virtual ~DisconnectWindowGtk();
 
-  virtual bool Show(const UiStrings& ui_strings,
-                    const base::Closure& disconnect_callback,
+  virtual bool Show(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);
+  void CreateWindow();
 
   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_;
 
+  // Points to the localized strings.
+  const UiStrings* ui_strings_;
+
   DISALLOW_COPY_AND_ASSIGN(DisconnectWindowGtk);
 };
 
-DisconnectWindowGtk::DisconnectWindowGtk()
+DisconnectWindowGtk::DisconnectWindowGtk(const UiStrings* ui_strings)
     : disconnect_window_(NULL),
       current_width_(0),
-      current_height_(0) {
+      current_height_(0),
+      ui_strings_(ui_strings) {
 }
 
 DisconnectWindowGtk::~DisconnectWindowGtk() {
   Hide();
 }
 
-void DisconnectWindowGtk::CreateWindow(const UiStrings& ui_strings) {
-  if (disconnect_window_) return;
+void DisconnectWindowGtk::CreateWindow() {
+  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);
-  gtk_window_set_title(window, UTF16ToUTF8(ui_strings.product_name).c_str());
+  gtk_window_set_title(window, UTF16ToUTF8(ui_strings_->product_name).c_str());
   gtk_window_set_resizable(window, FALSE);
 
   // Try to keep the window always visible.
   gtk_window_stick(window);
   gtk_window_set_keep_above(window, TRUE);
 
   // Remove window titlebar.
   gtk_window_set_decorated(window, FALSE);
 
   // In case the titlebar is still there, try to remove some of the buttons.
@@ skipping 23 matching lines @@
   // left and right.  The left margin is made larger to accommodate the
   // window movement gripper.
   GtkWidget* align = gtk_alignment_new(0, 0, 1, 1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(align), 8, 8, 24, 12);
   gtk_container_add(GTK_CONTAINER(window), align);
 
   GtkWidget* button_row = gtk_hbox_new(FALSE, 12);
   gtk_container_add(GTK_CONTAINER(align), button_row);
 
   button_ = gtk_button_new_with_label(
-      UTF16ToUTF8(ui_strings.disconnect_button_text).c_str());
+      UTF16ToUTF8(ui_strings_->disconnect_button_text).c_str());
   gtk_box_pack_end(GTK_BOX(button_row), button_, FALSE, FALSE, 0);
 
   g_signal_connect(button_, "clicked", G_CALLBACK(OnClickedThunk), this);
 
   message_ = gtk_label_new(NULL);
   gtk_box_pack_end(GTK_BOX(button_row), message_, FALSE, FALSE, 0);
 
   // Override any theme setting for the text color, so that the text is
   // 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 base::Closure& disconnect_callback,
+bool DisconnectWindowGtk::Show(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);
+  CreateWindow();
 
   string16 text = ReplaceStringPlaceholders(
-      ui_strings.disconnect_message, UTF8ToUTF16(username), NULL);
+      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_));
   return true;
 }
 
 void DisconnectWindowGtk::Hide() {
   if (disconnect_window_) {
     gtk_widget_destroy(disconnect_window_);
     disconnect_window_ = NULL;
   }
@@ skipping 118 matching lines @@
 gboolean DisconnectWindowGtk::OnButtonPress(GtkWidget* widget,
                                               GdkEventButton* event) {
   gtk_window_begin_move_drag(GTK_WINDOW(disconnect_window_),
                              event->button,
                              event->x_root,
                              event->y_root,
                              event->time);
   return FALSE;
 }
 
-scoped_ptr<DisconnectWindow> DisconnectWindow::Create() {
-  return scoped_ptr<DisconnectWindow>(new DisconnectWindowGtk());
+scoped_ptr<DisconnectWindow> DisconnectWindow::Create(
+    const UiStrings* ui_strings) {
+  return scoped_ptr<DisconnectWindow>(new DisconnectWindowGtk(ui_strings));
 }
 
 }  // namespace remoting