| Index: chrome/browser/ui/panels/base_panel_browser_test.cc
|
| diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| index 29d4176e9c574cf1b2946f6dc56bce32657e1a5b..8b1ad95371b9739b81e0d4a973e5357f7613cb61 100644
|
| --- a/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| @@ -246,7 +246,7 @@ BasePanelBrowserTest::~BasePanelBrowserTest() {
|
| }
|
|
|
| bool BasePanelBrowserTest::SkipTestIfIceWM() {
|
| -#if defined(OS_LINUX)
|
| +#if defined(OS_LINUX) && defined(USE_X11)
|
| return ui::GuessWindowManager() == ui::WM_ICE_WM;
|
| #else
|
| return false;
|
| @@ -254,7 +254,7 @@ bool BasePanelBrowserTest::SkipTestIfIceWM() {
|
| }
|
|
|
| bool BasePanelBrowserTest::SkipTestIfCompizWM() {
|
| -#if defined(OS_LINUX)
|
| +#if defined(OS_LINUX) && defined(USE_X11)
|
| return ui::GuessWindowManager() == ui::WM_COMPIZ;
|
| #else
|
| return false;
|
| @@ -392,7 +392,7 @@ Panel* BasePanelBrowserTest::CreatePanelWithParams(
|
| if (params.wait_for_fully_created) {
|
| base::MessageLoopForUI::current()->RunUntilIdle();
|
|
|
| -#if defined(OS_LINUX)
|
| +#if defined(OS_LINUX) && defined(USE_X11)
|
| // On bots, we might have a simple window manager which always activates new
|
| // windows, and can't always deactivate them. Re-activate the main tabbed
|
| // browser to "deactivate" the newly created panel.
|
|
|