Add support for X11 workspaces

chrome/browser/ui/views/frame/browser_frame.cc

Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index 32d0e94a9bf414369845ed536c5107c34fb09698..004fb32a9accf5e4f9a12b197b915de8a0f27a68 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -79,6 +79,8 @@ void BrowserFrame::InitBrowserFrame() {
     chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(),
                                              &params.bounds,
                                              &params.show_state);
+    chrome::GetSavedWindowWorkspace(browser_view_->browser(),
+                                    &params.workspace);
   }
 
   Init(params);
@@ -209,6 +211,11 @@ void BrowserFrame::OnNativeWidgetActivationChanged(bool active) {
   Widget::OnNativeWidgetActivationChanged(active);
 }
 
+void BrowserFrame::OnNativeWidgetWorkspaceChanged(int workspace_id) {
+  chrome::SaveWindowWorkspace(browser_view_->browser(), workspace_id);
+  Widget::OnNativeWidgetWorkspaceChanged(workspace_id);
+}
+
 void BrowserFrame::ShowContextMenuForView(views::View* source,
                                           const gfx::Point& p,
                                           ui::MenuSourceType source_type) {