Make ChromotingHost::ui_strings() immutable.

remoting/host/continue_window_linux.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 "remoting/host/continue_window.h"
 
 #include <gtk/gtk.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.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 ContinueWindowLinux : public remoting::ContinueWindow {
  public:
   ContinueWindowLinux();
   virtual ~ContinueWindowLinux();
 
   virtual void Show(remoting::ChromotingHost* host) OVERRIDE;
   virtual void Hide() OVERRIDE;
 
  private:
   CHROMEGTK_CALLBACK_1(ContinueWindowLinux, void, OnResponse, int);
 
-  void CreateWindow(UiStrings* ui_strings);
+  void CreateWindow(const UiStrings& ui_strings);
 
   ChromotingHost* host_;
   GtkWidget* continue_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ContinueWindowLinux);
 };
 
 ContinueWindowLinux::ContinueWindowLinux()
     : host_(NULL),
       continue_window_(NULL) {
 }
 
 ContinueWindowLinux::~ContinueWindowLinux() {
 }
 
-void ContinueWindowLinux::CreateWindow(UiStrings* ui_strings) {
+void ContinueWindowLinux::CreateWindow(const UiStrings& ui_strings) {
   if (continue_window_) return;
 
   continue_window_ = gtk_dialog_new_with_buttons(
-      ui_strings->product_name.c_str(),
+      UTF16ToUTF8(ui_strings.product_name).c_str(),
       NULL,
       static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
-      ui_strings->stop_sharing_button_text.c_str(), GTK_RESPONSE_CANCEL,
-      ui_strings->continue_button_text.c_str(), GTK_RESPONSE_OK,
+      UTF16ToUTF8(ui_strings.stop_sharing_button_text).c_str(),
+      GTK_RESPONSE_CANCEL,
+      UTF16ToUTF8(ui_strings.continue_button_text).c_str(),
+      GTK_RESPONSE_OK,
       NULL);
 
   gtk_dialog_set_default_response(GTK_DIALOG(continue_window_),
                                   GTK_RESPONSE_OK);
   gtk_window_set_resizable(GTK_WINDOW(continue_window_), FALSE);
 
   // Set always-on-top, otherwise this window tends to be obscured by the
   // DisconnectWindow.
   gtk_window_set_keep_above(GTK_WINDOW(continue_window_), TRUE);
 
   g_signal_connect(continue_window_, "response",
                    G_CALLBACK(OnResponseThunk), this);
 
   GtkWidget* content_area =
       gtk_dialog_get_content_area(GTK_DIALOG(continue_window_));
 
-  GtkWidget* text_label = gtk_label_new(ui_strings->continue_prompt.c_str());
+  GtkWidget* text_label =
+      gtk_label_new(UTF16ToUTF8(ui_strings.continue_prompt).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(text_label), TRUE);
   // TODO(lambroslambrou): Fix magic numbers, as in disconnect_window_linux.cc.
   gtk_misc_set_padding(GTK_MISC(text_label), 12, 12);
   gtk_container_add(GTK_CONTAINER(content_area), text_label);
 
   gtk_widget_show_all(content_area);
 }
 
 void ContinueWindowLinux::Show(remoting::ChromotingHost* host) {
   host_ = host;
@@ skipping 16 matching lines @@
     host_->Shutdown(NULL);
   }
   Hide();
 }
 
 ContinueWindow* ContinueWindow::Create() {
   return new ContinueWindowLinux();
 }
 
 }  // namespace remoting