Reorder browser list on workspace switch

chrome/browser/ui/views/frame/browser_frame.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/ui/views/frame/browser_frame.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 23 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
 #endif
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
+#endif
+
 #if defined(OS_WIN)
 #include "ui/native_theme/native_theme_dark_win.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 BrowserFrame::BrowserFrame(BrowserView* browser_view)
     : native_browser_frame_(nullptr),
       root_view_(nullptr),
@@ skipping 160 matching lines @@
     // still bring this browser window to the foreground.  We explicitly set
     // ourselves as the last active browser window to ensure that we get treated
     // as such by the rest of Chrome.
     BrowserList::SetLastActive(browser_view_->browser());
   }
   Widget::OnNativeWidgetActivationChanged(active);
 }
 
 void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
   chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  BrowserList::MoveBrowsersInWorkspaceToFront(
+      views::X11DesktopHandler::get()->GetWorkspace());
+#endif
   Widget::OnNativeWidgetWorkspaceChanged();
 }
 
 void BrowserFrame::ShowContextMenuForView(views::View* source,
                                           const gfx::Point& p,
                                           ui::MenuSourceType source_type) {
   if (chrome::IsRunningInForcedAppMode())
     return;
 
   // Only show context menu if point is in unobscured parts of browser, i.e.
@@ skipping 34 matching lines @@
     menu_model_builder_.reset(
         new SystemMenuModelBuilder(browser_view_, browser_view_->browser()));
     menu_model_builder_->Init();
   }
   return menu_model_builder_->menu_model();
 }
 
 views::View* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->GetProfileSwitcherView();
 }