After chromium stop using gtk+ for Linux/X11 all not ASCII character in window title start looks like garbage. This patch fixes this issue, by using algorithm similar to gtk+/Qt's way of setting window titles.

BUG=378096
R=erg@chromium.org

Review URL: https://codereview.chromium.org/414413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286058 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 5 deletions

diff --git a/AUTHORS b/AUTHORS
index 901f307..495f296 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -118,6 +118,7 @@ Etienne Laurin <etienne@atnnn.com>
 Evan Peterson <evan.peterson.ep@gmail.com>
 Evan Wallace <evan.exe@gmail.com>
 Evangelos Foutras <evangelos@foutrelis.com>
+Evgeniy Dushistov <dushistov@gmail.com>
 Fabien Tassin <fta@sofaraway.org>
 Felix H. Dahlke <fhd@ubercode.de>
 Fernando Jiménez Moreno <ferjmoreno@gmail.com>
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index cae42de..852fa2d 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -627,11 +627,22 @@ bool DesktopWindowTreeHostX11::SetWindowTitle(const base::string16& title) {
                   PropModeReplace,
                   reinterpret_cast<const unsigned char*>(utf8str.c_str()),
                   utf8str.size());
-  // TODO(erg): This is technically wrong. So XStoreName and friends expect
-  // this in Host Portable Character Encoding instead of UTF-8, which I believe
-  // is Compound Text. This shouldn't matter 90% of the time since this is the
-  // fallback to the UTF8 property above.
-  XStoreName(xdisplay_, xwindow_, utf8str.c_str());
+  XTextProperty xtp;
+  char *c_utf8_str = const_cast<char *>(utf8str.c_str());
+  const int err =
+    Xutf8TextListToTextProperty(xdisplay_, &c_utf8_str, 1,
+                                XCompoundTextStyle, &xtp);
+  if (err != Success) {
+    const std::string ascii_str = base::UTF16ToASCII(title);
+    xtp.encoding = XA_STRING;
+    xtp.format = 8;
+    xtp.value = reinterpret_cast<unsigned char *>
+      (const_cast<char *>(ascii_str.c_str()));
+    xtp.nitems = ascii_str.size();
+    XSetWMName(xdisplay_, xwindow_, &xtp);
+  } else {
+    XSetWMName(xdisplay_, xwindow_, &xtp);
+  }
   return true;
 }