Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1760)

Unified Diff: remoting/host/continue_window_gtk.cc

Issue 21059003: Localized Chromoting Host on Mac and Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/continue_window.cc ('k') | remoting/host/continue_window_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/continue_window_gtk.cc
diff --git a/remoting/host/continue_window_gtk.cc b/remoting/host/continue_window_gtk.cc
index 238b509c3853fec735a42da88bf6e7fc4dbcf4bd..66cde6278b37dd6a6ce6ba00c7de8ed44da6ecc6 100644
--- a/remoting/host/continue_window_gtk.cc
+++ b/remoting/host/continue_window_gtk.cc
@@ -7,14 +7,16 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
+#include "remoting/base/string_resources.h"
#include "remoting/host/continue_window.h"
#include "ui/base/gtk/gtk_signal.h"
+#include "ui/base/l10n/l10n_util.h"
namespace remoting {
class ContinueWindowGtk : public ContinueWindow {
public:
- explicit ContinueWindowGtk(const UiStrings& ui_strings);
+ ContinueWindowGtk();
virtual ~ContinueWindowGtk();
protected:
@@ -32,9 +34,8 @@ class ContinueWindowGtk : public ContinueWindow {
DISALLOW_COPY_AND_ASSIGN(ContinueWindowGtk);
};
-ContinueWindowGtk::ContinueWindowGtk(const UiStrings& ui_strings)
- : ContinueWindow(ui_strings),
- continue_window_(NULL) {
+ContinueWindowGtk::ContinueWindowGtk()
+ : continue_window_(NULL) {
}
ContinueWindowGtk::~ContinueWindowGtk() {
@@ -67,12 +68,12 @@ void ContinueWindowGtk::CreateWindow() {
DCHECK(!continue_window_);
continue_window_ = gtk_dialog_new_with_buttons(
- UTF16ToUTF8(ui_strings().product_name).c_str(),
+ l10n_util::GetStringUTF8(IDR_PRODUCT_NAME).c_str(),
NULL,
static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
- UTF16ToUTF8(ui_strings().stop_sharing_button_text).c_str(),
+ l10n_util::GetStringUTF8(IDR_STOP_SHARING_BUTTON).c_str(),
GTK_RESPONSE_CANCEL,
- UTF16ToUTF8(ui_strings().continue_button_text).c_str(),
+ l10n_util::GetStringUTF8(IDR_CONTINUE_BUTTON).c_str(),
GTK_RESPONSE_OK,
NULL);
@@ -91,7 +92,7 @@ void ContinueWindowGtk::CreateWindow() {
gtk_dialog_get_content_area(GTK_DIALOG(continue_window_));
GtkWidget* text_label =
- gtk_label_new(UTF16ToUTF8(ui_strings().continue_prompt).c_str());
+ gtk_label_new(l10n_util::GetStringUTF8(IDR_CONTINUE_PROMPT).c_str());
gtk_label_set_line_wrap(GTK_LABEL(text_label), TRUE);
// TODO(lambroslambrou): Fix magic numbers, as in disconnect_window_gtk.cc.
gtk_misc_set_padding(GTK_MISC(text_label), 12, 12);
@@ -113,9 +114,8 @@ void ContinueWindowGtk::OnResponse(GtkWidget* dialog, int response_id) {
}
// static
-scoped_ptr<HostWindow> HostWindow::CreateContinueWindow(
- const UiStrings& ui_strings) {
- return scoped_ptr<HostWindow>(new ContinueWindowGtk(ui_strings));
+scoped_ptr<HostWindow> HostWindow::CreateContinueWindow() {
+ return scoped_ptr<HostWindow>(new ContinueWindowGtk());
}
} // namespace remoting
« no previous file with comments | « remoting/host/continue_window.cc ('k') | remoting/host/continue_window_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698