Add support for X11 workspaces

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/Xatom.h>
 #include <X11/Xregion.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/shape.h>
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
@@ skipping 530 matching lines @@
   // We can't reliably track the restored bounds of a window, but we can get
   // 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 "";

[sky, 2016/05/03 17:40:53]

std::string()

[Tom (Use chromium acct), 2016/05/03 19:38:39]

Done.

+}
+
 gfx::Rect DesktopWindowTreeHostX11::GetWorkAreaBoundsInScreen() const {
   return ToDIPRect(GetWorkAreaBoundsInPixels());
 }
 
 void DesktopWindowTreeHostX11::SetShape(SkRegion* native_region) {
   custom_window_shape_ = false;
   window_shape_.reset();
 
   if (native_region) {
     gfx::Transform transform = GetRootTransform();
@@ skipping 642 matching lines @@
 
   // 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"));
 
   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.size()) {

[sky, 2016/05/03 17:40:53]

!params.workspace.empty()

[Tom (Use chromium acct), 2016/05/03 19:38:39]

Done.

+    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
   // SetWMSpecState) has no effect here since the window has not yet been
   // mapped. So we manually change the state.
   if (!state_atom_list.empty()) {
     ui::SetAtomArrayProperty(xwindow_,
                              "_NET_WM_STATE",
                              "ATOM",
                              state_atom_list);
@@ skipping 744 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")) {

[sky, 2016/05/03 17:40:53]

nit: no {} here as all branches are a single line.

[Tom (Use chromium acct), 2016/05/03 19:38:39]

Done.

         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();
+      }
       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