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

Unified Diff: ui/views/widget/widget_unittest.cc

Issue 1849343003: mac: Remove IsOSSnowLeopard(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 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
« no previous file with comments | « ui/views/widget/native_widget_mac_interactive_uitest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 67c2a6ce8d4470f6d261d876c4a7d3519d2579c0..3cf6cd9b85db0756b2e7260dd208741c149817d4 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -61,15 +61,6 @@ gfx::Point ConvertPointFromWidgetToView(View* view, const gfx::Point& p) {
return tmp;
}
-// Helper function for Snow Leopard special cases to avoid #ifdef litter.
-bool IsTestingSnowLeopard() {
-#if defined(OS_MACOSX)
- return base::mac::IsOSSnowLeopard();
-#else
- return false;
-#endif
-}
-
// This class can be used as a deleter for scoped_ptr<Widget>
// to call function Widget::CloseNow automatically.
struct WidgetCloser {
@@ -1161,14 +1152,8 @@ TEST_F(WidgetTest, MAYBE_GetRestoredBounds) {
toplevel->SetFullscreen(true);
RunPendingMessages();
- if (IsTestingSnowLeopard()) {
- // Fullscreen not implemented for Snow Leopard.
- EXPECT_EQ(toplevel->GetWindowBoundsInScreen(),
- toplevel->GetRestoredBounds());
- } else {
- EXPECT_NE(toplevel->GetWindowBoundsInScreen(),
- toplevel->GetRestoredBounds());
- }
+ EXPECT_NE(toplevel->GetWindowBoundsInScreen(),
+ toplevel->GetRestoredBounds());
EXPECT_EQ(bounds, toplevel->GetRestoredBounds());
toplevel->SetFullscreen(false);
@@ -3070,12 +3055,7 @@ TEST_F(WidgetTest, FullscreenFrameLayout) {
widget->Show();
RunPendingMessages();
- if (IsTestingSnowLeopard()) {
- // Fullscreen is currently ignored on Snow Leopard.
- EXPECT_FALSE(frame->fullscreen_layout_called());
- } else {
- EXPECT_TRUE(frame->fullscreen_layout_called());
- }
+ EXPECT_TRUE(frame->fullscreen_layout_called());
}
#if !defined(OS_CHROMEOS)
« no previous file with comments | « ui/views/widget/native_widget_mac_interactive_uitest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698