Add support for X11 workspaces

chrome/browser/sessions/session_service.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 "chrome/browser/sessions/session_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 151 matching lines @@
 void SessionService::SetWindowBounds(const SessionID& window_id,
                                      const gfx::Rect& bounds,
                                      ui::WindowShowState show_state) {
   if (!ShouldTrackChangesToWindow(window_id))
     return;
 
   ScheduleCommand(
       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) {
   if (!ShouldTrackChangesToWindow(window_id))
     return;
 
   ScheduleCommand(
       sessions::CreateSetTabIndexInWindowCommand(tab_id, new_index));
 }
 
@@ skipping 625 matching lines @@
       sessions::CreateSetWindowTypeCommand(
           browser->session_id(),
           WindowTypeForBrowserType(browser->type())));
 
   if (!browser->app_name().empty()) {
     base_session_service_->AppendRebuildCommand(
         sessions::CreateSetWindowAppNameCommand(
             browser->session_id(),
             browser->app_name()));
   }
 

[sky, 2016/04/29 17:05:45]

You'll need to save the workspace some where in this function too.

[Tom (Use chromium acct), 2016/04/29 19:14:03]

Done.  Although I had to add a lot of plumbing to get GetRestoredWorkspace
working.  Could you check the deltas on this?  In particular, I'm worried about
NativeWidgetAura::GetRestoredWorkspace and NativeWidgetMus::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) {
     WebContents* tab = tab_strip->GetWebContentsAt(i);
     DCHECK(tab);
     BuildCommandsForTab(browser->session_id(),
                         tab,
                         i,
                         tab_strip->IsTabPinned(i),
                         tab_to_available_range);
@@ skipping 256 matching lines @@
   for (auto* browser : *BrowserList::GetInstance()) {
     if (browser->profile() == profile())
       return;
   }
   DeleteSessionOnlyData(profile());
 }
 
 sessions::BaseSessionService* SessionService::GetBaseSessionServiceForTest() {
   return base_session_service_.get();
 }