Renames WmShell to ShellPort

ash/wm/immersive_fullscreen_controller_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/shared/immersive_fullscreen_controller.h"
 
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/immersive_fullscreen_controller_test_api.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
-#include "ash/wm_shell.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/event_utils.h"
@@ skipping 227 matching lines @@
   views::View* top_container_;           // Owned by |widget_|'s root-view.
   views::NativeViewHost* content_view_;  // Owned by |widget_|'s root-view.
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenControllerTest);
 };
 
 // Test the initial state and that the delegate gets notified of the
 // top-of-window views getting hidden and revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Delegate) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   // Initial state.
   EXPECT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
   EXPECT_FALSE(delegate()->is_enabled());
 
   // Enabling initially hides the top views.
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
@@ skipping 63 matching lines @@
   lock1.reset();
   EXPECT_TRUE(controller()->IsRevealed());
 
   lock2.reset();
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test mouse event processing for top-of-screen reveal triggering.
 TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   // Set up initial state.
   SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
   ASSERT_FALSE(controller()->IsRevealed());
 
   ui::test::EventGenerator& event_generator(GetEventGenerator());
 
   gfx::Rect top_container_bounds_in_screen =
@@ skipping 83 matching lines @@
 
   // Releasing capture should end the reveal.
   widget->ReleaseCapture();
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test mouse event processing for top-of-screen reveal triggering when the
 // top container's widget is inactive.
 TEST_F(ImmersiveFullscreenControllerTest, Inactive) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   // Set up initial state.
   views::Widget* popup_widget = views::Widget::CreateWindowWithContextAndBounds(
       nullptr, CurrentContext(), gfx::Rect(0, 0, 200, 200));
   popup_widget->Show();
   ASSERT_FALSE(top_container()->GetWidget()->IsActive());
 
   SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
@@ skipping 40 matching lines @@
             top_container_bounds_in_screen.bottom() + 50);
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test mouse event processing for top-of-screen reveal triggering when the user
 // has a vertical display layout (primary display above/below secondary display)
 // and the immersive fullscreen window is on the bottom display.
 TEST_F(ImmersiveFullscreenControllerTest, MouseEventsVerticalDisplayLayout) {
   // TODO: SetLayoutForCurrentDisplays() needs to ported to mash.
   // http://crbug.com/698043.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   // Set up initial state.
   UpdateDisplay("800x600,800x600");
   ash::Shell::Get()->display_manager()->SetLayoutForCurrentDisplays(
       display::test::CreateDisplayLayout(display_manager(),
                                          display::DisplayPlacement::TOP, 0));
 
   SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
@@ skipping 65 matching lines @@
   ASSERT_FALSE(top_container()->GetBoundsInScreen().Intersects(
       popup_widget->GetWindowBoundsInScreen()));
   event_generator.MoveMouseTo(x, y_top_edge + 1);
   MoveMouse(x, y_top_edge - 2);
   EXPECT_TRUE(controller()->IsRevealed());
 }
 
 // Test behavior when the mouse becomes hovered without moving.
 TEST_F(ImmersiveFullscreenControllerTest, MouseHoveredWithoutMoving) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   SetEnabled(true);
   std::unique_ptr<ImmersiveRevealedLock> lock;
 
   // 1) Test that if the mouse becomes hovered without the mouse moving due to a
   // lock causing the top-of-window views to be revealed (and the mouse
   // happening to be near the top of the screen), the top-of-window views do not
   // hide till the mouse moves off of the top-of-window views.
   SetHovered(true);
@@ skipping 32 matching lines @@
   SetHovered(false);
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test revealing the top-of-window views using one modality and ending
 // the reveal via another. For instance, initiating the reveal via a SWIPE_OPEN
 // edge gesture, switching to using the mouse and ending the reveal by moving
 // the mouse off of the top-of-window views.
 TEST_F(ImmersiveFullscreenControllerTest, DifferentModalityEnterExit) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
 
   // Initiate reveal via gesture, end reveal via mouse.
   AttemptReveal(MODALITY_GESTURE_SCROLL);
   EXPECT_TRUE(controller()->IsRevealed());
   MoveMouse(1, 1);
@@ skipping 16 matching lines @@
   // Initiate reveal via mouse, end reveal via touch.
   AttemptReveal(MODALITY_MOUSE);
   EXPECT_TRUE(controller()->IsRevealed());
   AttemptUnreveal(MODALITY_GESTURE_TAP);
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test when the SWIPE_CLOSE edge gesture closes the top-of-window views.
 TEST_F(ImmersiveFullscreenControllerTest, EndRevealViaGesture) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
 
   // A gesture should be able to close the top-of-window views when
   // top-of-window views have focus.
   AttemptReveal(MODALITY_MOUSE);
   top_container()->RequestFocus();
@@ skipping 15 matching lines @@
   AttemptUnreveal(MODALITY_GESTURE_SCROLL);
   EXPECT_TRUE(controller()->IsRevealed());
   lock.reset();
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Tests that touch-gesture can be used to reveal the top-of-window views when
 // the child window consumes all events.
 TEST_F(ImmersiveFullscreenControllerTest, RevealViaGestureChildConsumesEvents) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   // Enabling initially hides the top views.
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
 
   aura::test::TestWindowDelegate child_delegate;
   std::unique_ptr<aura::Window> child(
       CreateTestWindowInShellWithDelegateAndType(
@@ skipping 62 matching lines @@
 
   SetEnabled(false);
   ASSERT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(window_state->in_immersive_fullscreen());
 }
 
 // Test how focus and activation affects whether the top-of-window views are
 // revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Focus) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   // Add views to the view hierarchy which we will focus and unfocus during the
   // test.
   views::View* child_view = new views::View();
   child_view->SetBounds(0, 0, 10, 10);
   child_view->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
   top_container()->AddChildView(child_view);
   views::View* unrelated_view = new views::View();
   unrelated_view->SetBounds(0, 100, 10, 10);
@@ skipping 48 matching lines @@
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsRevealed());
   lock.reset();
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test how transient windows affect whether the top-of-window views are
 // revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Transient) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   views::Widget* top_container_widget = top_container()->GetWidget();
 
   SetEnabled(true);
   ASSERT_FALSE(controller()->IsRevealed());
 
   // 1) Test that a transient window which is not a bubble does not trigger a
   // reveal but does keep the top-of-window views revealed if they are already
   // revealed.
@@ skipping 28 matching lines @@
   AttemptReveal(MODALITY_MOUSE);
   EXPECT_TRUE(controller()->IsRevealed());
   non_transient_widget->Show();
   SetHovered(false);
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test how bubbles affect whether the top-of-window views are revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   // TODO: investigate failure. http://crbug.com/698085.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   std::unique_ptr<ImmersiveRevealedLock> revealed_lock;
   views::Widget* top_container_widget = top_container()->GetWidget();
 
   // Add views to the view hierarchy to which we will anchor bubbles.
   views::View* child_view = new views::View();
   child_view->SetBounds(0, 0, 10, 10);
   top_container()->AddChildView(child_view);
   views::View* unrelated_view = new views::View();
@@ skipping 142 matching lines @@
   SetEnabled(true);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
 
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
 }
 
 }  // namespase ash