Remove WindowState::IsNormalShowState()

ash/wm/caption_buttons/frame_maximize_button_unittest.cc

 // Copyright 2013 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 "ash/wm/caption_buttons/frame_maximize_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 208 matching lines @@
 
 // Tests that click+dragging on the resize-button tiles or minimizes the window.
 TEST_F(FrameMaximizeButtonTest, MAYBE_ResizeButtonDrag) {
   aura::Window* window = widget()->GetNativeWindow();
   views::View* view = maximize_button();
   gfx::Point center = view->GetBoundsInScreen().CenterPoint();
 
   aura::test::EventGenerator generator(window->GetRootWindow(), center);
 
   wm::WindowState* window_state = wm::GetWindowState(window);
-  EXPECT_TRUE(window_state->IsNormalShowState());
+  EXPECT_TRUE(window_state->IsNormalShowType());
 
   // Snap right.
   {
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 0);
     generator.ReleaseLeftButton();
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(window_state->IsMaximized());
     EXPECT_FALSE(window_state->IsMinimized());
@@ skipping 80 matching lines @@
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_TRUE(window_state->IsMinimized());
   }
 
   // Test with gesture events.
 }
 
-#if defined(OS_WIN)
-// RootWindow and Display can't resize on Windows Ash. http://crbug.com/165962
-#define MAYBE_TouchDragResizeCloseToCornerDiffersFromMouse \
-        DISABLED_TouchDragResizeCloseToCornerDiffersFromMouse
-#else
-#define MAYBE_TouchDragResizeCloseToCornerDiffersFromMouse \
-        TouchDragResizeCloseToCornerDiffersFromMouse
-#endif
-
 // Test that closing the (browser) window with an opened balloon does not
 // crash the system. In other words: Make sure that shutting down the frame
 // destroys the opened balloon in an orderly fashion.
 TEST_F(FrameMaximizeButtonTest, MaximizeButtonExternalShutDown) {
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
 
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Even though the widget is closing the bubble menu should not crash upon
   // its delayed destruction.
   CloseWidget();
 }
 
 // Test that maximizing the browser after hovering in does not crash the system
 // when the observer gets removed in the bubble destruction process.
 TEST_F(FrameMaximizeButtonTest, MaximizeOnHoverThenClick) {
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
 
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
   generator.ClickLeftButton();
   EXPECT_TRUE(wm::GetWindowState(window)->IsMaximized());
 }
 
 // Test that hovering over a button in the balloon dialog will show the phantom
 // window. Moving then away from the button will hide it again. Then check that
 // pressing and dragging the button itself off the button will also release the
 // phantom window.
 TEST_F(FrameMaximizeButtonTest, MaximizeLeftButtonDragOut) {
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
   EXPECT_FALSE(maximize_button->phantom_window_open());
 
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Move the mouse over the left maximize button.
   gfx::Point left_max_pos = maximize_button->maximizer()->
       GetButtonForUnitTest(SNAP_LEFT)->GetBoundsInScreen().CenterPoint();
 
@@ skipping 25 matching lines @@
   aura::Window* window = widget()->GetNativeWindow();
 
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
   EXPECT_FALSE(maximize_button->phantom_window_open());
 
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Move the mouse over the left maximize button.
   gfx::Point left_max_pos = maximize_button->maximizer()->
       GetButtonForUnitTest(SNAP_LEFT)->GetBoundsInScreen().CenterPoint();
   generator.MoveMouseTo(left_max_pos);
@@ skipping 16 matching lines @@
 TEST_F(FrameMaximizeButtonTest, MaximizeKeepFocus) {
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
 
   aura::Window* active =
       aura::client::GetFocusClient(window)->GetFocusedWindow();
 
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Check that the focused window is still the same.
   EXPECT_EQ(active, aura::client::GetFocusClient(window)->GetFocusedWindow());
@@ skipping 36 matching lines @@
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   EXPECT_FALSE(maximize_button->maximizer());
   wm::WindowState* window_state = wm::GetWindowState(window);
-  EXPECT_TRUE(window_state->IsNormalShowState());
+  EXPECT_TRUE(window_state->IsNormalShowType());
   EXPECT_FALSE(window_state->IsMaximized());
 
   // Move the mouse cursor over the button.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
   EXPECT_FALSE(maximize_button->phantom_window_open());
 
   // After pressing the left button the button should get triggered.
   generator.PressLeftButton();
   RunAllPendingInMessageLoop();
@@ skipping 237 matching lines @@
 
 // Test that hovering over a button in the maximizer bubble and switching
 // activation without moving the mouse properly aborts.
 TEST_F(FrameMaximizeButtonTest, LossOfActivationWhileMaximizeBubbleOpenAborts) {
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
 
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
   EXPECT_TRUE(widget()->IsActive());
 
   // Move the mouse over the maximize button in order to bring up the maximizer
   // bubble.
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Hover the mouse over the left maximize button in the maximizer bubble to
   // show the phantom window.
   gfx::Point left_max_pos = maximize_button->maximizer()->
       GetButtonForUnitTest(SNAP_LEFT)->GetBoundsInScreen().CenterPoint();
   generator.MoveMouseTo(left_max_pos);
   EXPECT_TRUE(maximize_button->phantom_window_open());
 
   // Change activation by creating a new window. This could be done via an
   // accelerator. The root window takes ownership of |just_created|.
   views::Widget* just_created = views::Widget::CreateWindowWithContextAndBounds(
       NULL, widget()->GetNativeWindow(), gfx::Rect(100, 100));
   just_created->Show();
   just_created->Activate();
   EXPECT_FALSE(widget()->IsActive());
 
   // Test that we have properly reset the state of the now inactive window.
   EXPECT_FALSE(maximize_button->maximizer());
   EXPECT_FALSE(maximize_button->phantom_window_open());
-  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
+  EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowType());
   EXPECT_EQ(initial_bounds.ToString(), window->GetBoundsInScreen().ToString());
 }
 
 }  // namespace test
 }  // namespace ash