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

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

Issue 368163004: Reenable most panel interactive_ui_tests on Linux (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/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 1ffb616b58c7df411f517080c3fdf7623f02fbc5..52c4d3038813f980d8bb620657c0fab1417fab91 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -521,11 +521,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, AnimateBounds) {
// Set bounds with animation.
gfx::Rect bounds = gfx::Rect(10, 20, 150, 160);
panel->SetPanelBounds(bounds);
- // There is no animation on Linux, by design.
-#if !defined(OS_LINUX)
pkotwicz 2014/07/07 14:55:46 It will take some time before we can disable anima
EXPECT_TRUE(panel_testing->IsAnimatingBounds());
WaitForBoundsAnimationFinished(panel);
-#endif
EXPECT_FALSE(panel_testing->IsAnimatingBounds());
EXPECT_EQ(bounds, panel->GetBounds());
@@ -1727,14 +1724,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
EXPECT_TRUE(panel_testing->IsWindowVisible());
// Panel should become hidden when entering full-screen mode.
- // Note that this is not needed on Linux because the full-screen window will
- // be always placed above any other windows.
mock_display_settings_provider()->EnableFullScreenMode(true);
-#if defined(OS_LINUX)
- EXPECT_TRUE(panel_testing->IsWindowVisible());
-#else
EXPECT_FALSE(panel_testing->IsWindowVisible());
-#endif
// Panel should become visible when leaving full-screen mode.
mock_display_settings_provider()->EnableFullScreenMode(false);

Powered by Google App Engine
This is Rietveld 408576698