Reorder browser list on workspace switch

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 550 matching lines @@
   // the 90% case down. When *chrome* is the process that requests maximizing
   // or restoring bounds, we can record the current bounds before we request
   // maximization, and clear it when we detect a state change.
   if (!restored_bounds_in_pixels_.IsEmpty())
     return ToDIPRect(restored_bounds_in_pixels_);
 
   return GetWindowBoundsInScreen();
 }
 
 std::string DesktopWindowTreeHostX11::GetWorkspace() const {
-  int workspace_id;
-  if (ui::GetIntProperty(xwindow_, "_NET_WM_DESKTOP", &workspace_id))
-    return base::IntToString(workspace_id);
-  return std::string();
+  if (workspace_.empty())
+    const_cast<DesktopWindowTreeHostX11*>(this)->UpdateWorkspace();
+  return workspace_;
+}
+
+bool DesktopWindowTreeHostX11::UpdateWorkspace() {
+  int workspace_int;
+  if (!ui::GetWindowDesktop(xwindow_, &workspace_int))
+    return false;
+  std::string workspace_str = base::IntToString(workspace_int);
+  if (workspace_ == workspace_str)
+    return false;
+  workspace_ = workspace_str;
+  return true;
 }
 
 gfx::Rect DesktopWindowTreeHostX11::GetWorkAreaBoundsInScreen() const {
   return ToDIPRect(GetWorkAreaBoundsInPixels());
 }
 
 void DesktopWindowTreeHostX11::SetShape(SkRegion* native_region) {
   custom_window_shape_ = false;
   window_shape_.reset();
 
@@ skipping 638 matching lines @@
     state_atom_list.push_back(
         atom_cache_.GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
   }
 
   // If the window should stay on top of other windows, add the
   // _NET_WM_STATE_ABOVE property.
   is_always_on_top_ = params.keep_on_top;
   if (is_always_on_top_)
     state_atom_list.push_back(atom_cache_.GetAtom("_NET_WM_STATE_ABOVE"));
 
+  workspace_.clear();
   if (params.visible_on_all_workspaces) {
     state_atom_list.push_back(atom_cache_.GetAtom("_NET_WM_STATE_STICKY"));
     ui::SetIntProperty(xwindow_, "_NET_WM_DESKTOP", "CARDINAL", kAllDesktops);
   } else if (!params.workspace.empty()) {
     int workspace;
     if (base::StringToInt(params.workspace, &workspace))
       ui::SetIntProperty(xwindow_, "_NET_WM_DESKTOP", "CARDINAL", workspace);
   }
 
   // Setting _NET_WM_STATE by sending a message to the root_window (with
@@ skipping 746 matching lines @@
           break;
         }
       }
 
       ui::MouseEvent mouseev(xev);
       DispatchMouseEvent(&mouseev);
       break;
     }
     case PropertyNotify: {
       ::Atom changed_atom = xev->xproperty.atom;
-      if (changed_atom == atom_cache_.GetAtom("_NET_WM_STATE"))
+      if (changed_atom == atom_cache_.GetAtom("_NET_WM_STATE")) {
         OnWMStateUpdated();
-      else if (changed_atom == atom_cache_.GetAtom("_NET_FRAME_EXTENTS"))
+      } else if (changed_atom == atom_cache_.GetAtom("_NET_FRAME_EXTENTS")) {
         OnFrameExtentsUpdated();
-      else if (changed_atom == atom_cache_.GetAtom("_NET_WM_DESKTOP"))
-        OnHostWorkspaceChanged();
+      } else if (changed_atom == atom_cache_.GetAtom("_NET_WM_DESKTOP")) {
+        if (UpdateWorkspace())
+          OnHostWorkspaceChanged();
+      }
       break;
     }
     case SelectionNotify: {
       drag_drop_client_->OnSelectionNotify(xev->xselection);
       break;
     }
   }
   return ui::POST_DISPATCH_STOP_PROPAGATION;
 }
 
@@ skipping 55 matching lines @@
   if (linux_ui) {
     ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
     if (native_theme)
       return native_theme;
   }
 
   return ui::NativeThemeAura::instance();
 }
 
 }  // namespace views