Add support for X11 workspaces

chrome/browser/sessions/session_service.cc

Index: chrome/browser/sessions/session_service.cc
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 74fcfae78ae4506834f01e76b2e4e939c775e168..662fbb19c84f5b1e4958a3c22cdeacdadb43e420 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -169,6 +169,15 @@ void SessionService::SetWindowBounds(const SessionID& window_id,
       sessions::CreateSetWindowBoundsCommand(window_id, bounds, show_state));
 }
 
+void SessionService::SetWindowWorkspace(const SessionID& window_id,
+                                        int workspace_id) {
+  if (!ShouldTrackChangesToWindow(window_id))
+    return;
+
+  ScheduleCommand(
+      sessions::CreateSetWindowWorkspaceCommand(window_id, workspace_id));
+}
+
 void SessionService::SetTabIndexInWindow(const SessionID& window_id,
                                          const SessionID& tab_id,
                                          int new_index) {
@@ -815,6 +824,12 @@ void SessionService::BuildCommandsForBrowser(
             browser->app_name()));
   }
 
+  if (browser->window()->GetRestoredWorkspace() != -1) {

[sky, 2016/05/02 15:11:23]

I wouldn't bother checking the return value, always save it.

[Tom (Use chromium acct), 2016/05/02 20:32:37]

Done.

+      sessions::CreateSetWindowWorkspaceCommand(
+          browser->session_id(),
+          browser->window()->GetRestoredWorkspace());
+  }
+
   windows_to_track->insert(browser->session_id().id());
   TabStripModel* tab_strip = browser->tab_strip_model();
   for (int i = 0; i < tab_strip->count(); ++i) {