Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: chrome/browser/ui/panels/base_panel_browser_test.cc

Issue 372743004: ozone: Fix interactive_ui_tests build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698