Merge pull request #38 from hmin/title

Fix 2 title related issues in aura port
crosswalk-project · Jul 18, 2013 · 4a31ab3 · 4a31ab3
2 parents 8f76bc9 + b38d5f9
commit 4a31ab3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -376,6 +376,7 @@ void DesktopNativeWidgetAura::GetWindowPlacement(
 }
 
 void DesktopNativeWidgetAura::SetWindowTitle(const string16& title) {
+  window_->set_title(title);
   desktop_root_window_host_->SetWindowTitle(title);
 }
 

diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
@@ -591,7 +591,8 @@ void DesktopRootWindowHostX11::SetAlwaysOnTop(bool always_on_top) {
 }
 
 void DesktopRootWindowHostX11::SetWindowTitle(const string16& title) {
-  XStoreName(xdisplay_, xwindow_, UTF16ToUTF8(title).c_str());
+  XmbSetWMProperties(xdisplay_, xwindow_, UTF16ToUTF8(title).c_str(), NULL,
+      NULL, 0, NULL, NULL, NULL);
 }
 
 void DesktopRootWindowHostX11::ClearNativeFocus() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -376,6 +376,7 @@ void DesktopNativeWidgetAura::GetWindowPlacement( @@
     }
     void DesktopNativeWidgetAura::SetWindowTitle(const string16& title) {
+      window_->set_title(title);
       desktop_root_window_host_->SetWindowTitle(title);
     }
@@ Expand Down @@