Linux: Relanding a patch from an external contributor.

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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 "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #include <X11/extensions/shape.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xregion.h>
@@ skipping 614 matching lines @@
   window_title_ = title;
   std::string utf8str = base::UTF16ToUTF8(title);
   XChangeProperty(xdisplay_,
                   xwindow_,
                   atom_cache_.GetAtom("_NET_WM_NAME"),
                   atom_cache_.GetAtom("UTF8_STRING"),
                   8,
                   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);

[sadrul, 2014/08/13 02:28:19]

Looks like XICCEncodingStyle can be = XUTF8StringStyle. Can we use that?

+  if (err != Success) {
+    XFree(xtp.value);
+    const std::string ascii_str = base::UTF16ToASCII(title);

[sadrul, 2014/08/13 02:28:19]

The doc for UTF16ToASCII() states "The result must be known to be ASCII
beforehand". I don't think we can know that here?

+    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);
+    XFree(xtp.value);
+  }
   return true;
 }
 
 void DesktopWindowTreeHostX11::ClearNativeFocus() {
   // This method is weird and misnamed. Instead of clearing the native focus,
   // it sets the focus to our |content_window_|, which will trigger a cascade
   // of focus changes into views.
   if (content_window_ && aura::client::GetFocusClient(content_window_) &&
       content_window_->Contains(
           aura::client::GetFocusClient(content_window_)->GetFocusedWindow())) {
@@ skipping 1258 matching lines @@
   if (linux_ui) {
     ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
     if (native_theme)
       return native_theme;
   }
 
   return ui::NativeTheme::instance();
 }
 
 }  // namespace views