Renames WmShell to ShellPort

ash/wm/system_modal_container_layout_manager_unittest.cc

 // Copyright (c) 2012 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/system_modal_container_layout_manager.h"
 
 #include <memory>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/container_finder.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
@@ skipping 119 matching lines @@
 }  // namespace
 
 class SystemModalContainerLayoutManagerTest : public AshTestBase {
  public:
   void SetUp() override {
     // Allow a virtual keyboard (and initialize it per default).
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
     AshTestBase::SetUp();
     // TODO: mash doesn't support virtual keyboard. http://crbug.com/698892.
-    if (!WmShell::Get()->IsRunningInMash()) {
+    if (!ShellPort::Get()->IsRunningInMash()) {
       Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
           keyboard::KeyboardController::GetInstance());
     }
   }
 
   void TearDown() override {
     // TODO: mash doesn't support virtual keyboard. http://crbug.com/698892.
-    if (!WmShell::Get()->IsRunningInMash()) {
+    if (!ShellPort::Get()->IsRunningInMash()) {
       Shell::GetPrimaryRootWindowController()->DeactivateKeyboard(
           keyboard::KeyboardController::GetInstance());
     }
     AshTestBase::TearDown();
   }
 
   aura::Window* OpenToplevelTestWindow(bool modal) {
     views::Widget* widget = views::Widget::CreateWindowWithContext(
         new TestWindow(modal), CurrentContext());
     widget->Show();
@@ skipping 480 matching lines @@
   TestWindow::CloseTestWindow(modal1.release());
   EXPECT_FALSE(AllRootWindowsHaveModalBackgrounds());
   EXPECT_TRUE(wm::IsActiveWindow(normal.get()));
 }
 
 // Test that with the visible keyboard, an existing system modal dialog gets
 // positioned into the visible area.
 TEST_F(SystemModalContainerLayoutManagerTest,
        SystemModalDialogGetPushedFromKeyboard) {
   // TODO: mash doesn't support virtual keyboard. http://crbug.com/698892.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   const gfx::Rect& container_bounds = GetModalContainer()->bounds();
   // Place the window at the bottom of the screen.
   gfx::Size modal_size(100, 100);
   gfx::Point modal_origin = gfx::Point(
       (container_bounds.right() - modal_size.width()) / 2,  // X centered
       container_bounds.bottom() - modal_size.height());     // at bottom
   gfx::Rect modal_bounds = gfx::Rect(modal_origin, modal_size);
 
@@ skipping 19 matching lines @@
   EXPECT_NE(modal_bounds.ToString(), modal_window->bounds().ToString());
   EXPECT_EQ(modal_size.ToString(), modal_window->bounds().size().ToString());
   EXPECT_EQ(modal_origin.x(), modal_window->bounds().x());
 }
 
 // Test that windows will not get cropped through the visible virtual keyboard -
 // if centered.
 TEST_F(SystemModalContainerLayoutManagerTest,
        SystemModalDialogGetPushedButNotCroppedFromKeyboard) {
   // TODO: mash doesn't support virtual keyboard. http://crbug.com/698892.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   const gfx::Rect& container_bounds = GetModalContainer()->bounds();
   const gfx::Size screen_size = Shell::GetPrimaryRootWindow()->bounds().size();
   // Place the window at the bottom of the screen.
   gfx::Size modal_size(100, screen_size.height() - 70);
   gfx::Point modal_origin = gfx::Point(
       (container_bounds.right() - modal_size.width()) / 2,  // X centered
       container_bounds.bottom() - modal_size.height());     // at bottom
   gfx::Rect modal_bounds = gfx::Rect(modal_origin, modal_size);
@@ skipping 16 matching lines @@
   EXPECT_EQ(0, modal_window->bounds().y());
 
   ShowKeyboard(false);
 }
 
 // Test that windows will not get cropped through the visible virtual keyboard -
 // if not centered.
 TEST_F(SystemModalContainerLayoutManagerTest,
        SystemModalDialogGetPushedButNotCroppedFromKeyboardIfNotCentered) {
   // TODO: mash doesn't support virtual keyboard. http://crbug.com/698892.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   const gfx::Size screen_size = Shell::GetPrimaryRootWindow()->bounds().size();
   // Place the window at the bottom of the screen.
   gfx::Size modal_size(100, screen_size.height() - 70);
   gfx::Point modal_origin = gfx::Point(10, 20);
   gfx::Rect modal_bounds = gfx::Rect(modal_origin, modal_size);
 
   // Create a modal window.
   std::unique_ptr<aura::Window> parent(OpenToplevelTestWindow(false));
@@ skipping 15 matching lines @@
   ShowKeyboard(false);
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest, UpdateModalType) {
   aura::Window* modal_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_SystemModalContainer);
   views::Widget* widget = views::Widget::CreateWindowWithParent(
       new TestWindow(false), modal_container);
   widget->Show();
   aura::Window* window = widget->GetNativeWindow();
-  EXPECT_FALSE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
 
   window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
-  EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
 
   // Setting twice should not cause error.
   window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
-  EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
 
   window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_NONE);
-  EXPECT_FALSE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
 
   window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
-  EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
 
   widget->Close();
-  EXPECT_FALSE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest, VisibilityChange) {
   std::unique_ptr<aura::Window> window(OpenToplevelTestWindow(false));
   std::unique_ptr<aura::Window> modal_window(
       views::Widget::CreateWindowWithContext(new TestWindow(true),
                                              CurrentContext())
           ->GetNativeWindow());
   SystemModalContainerLayoutManager* layout_manager =
-      WmShell::Get()
+      ShellPort::Get()
           ->GetPrimaryRootWindowController()
           ->GetSystemModalLayoutManager(WmWindow::Get(modal_window.get()));
 
-  EXPECT_FALSE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_FALSE(layout_manager->has_window_dimmer());
 
   modal_window->Show();
-  EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_TRUE(layout_manager->has_window_dimmer());
 
   // Make sure that a child visibility change should not cause
   // inconsistent state.
   std::unique_ptr<aura::Window> child = base::MakeUnique<aura::Window>(nullptr);
   child->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   child->Init(ui::LAYER_TEXTURED);
   modal_window->AddChild(child.get());
   child->Show();
-  EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_TRUE(layout_manager->has_window_dimmer());
 
   modal_window->Hide();
-  EXPECT_FALSE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_FALSE(layout_manager->has_window_dimmer());
 
   modal_window->Show();
-  EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
   EXPECT_TRUE(layout_manager->has_window_dimmer());
 }
 
 namespace {
 
 class InputTestDelegate : public aura::test::TestWindowDelegate {
  public:
   InputTestDelegate() {}
   ~InputTestDelegate() override {}
 
   void RunTest(test::AshTestBase* test_base) {
     std::unique_ptr<aura::Window> window(
         test_base->CreateTestWindowInShellWithDelegate(
             this, 0, gfx::Rect(0, 0, 100, 100)));
     window->Show();
 
     GenerateEvents(window.get());
 
     EXPECT_EQ(2, mouse_event_count_);
     EXPECT_EQ(3, scroll_event_count_);
     EXPECT_EQ(4, touch_event_count_);
     EXPECT_EQ(10, gesture_event_count_);
     Reset();
 
     views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
         new TestWindow(true), Shell::GetPrimaryRootWindow(),
         gfx::Rect(200, 200, 100, 100));
     widget->Show();
-    EXPECT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
+    EXPECT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
 
     // Events should be blocked.
     GenerateEvents(window.get());
 
     EXPECT_EQ(0, mouse_event_count_);
     EXPECT_EQ(0, scroll_event_count_);
     EXPECT_EQ(0, touch_event_count_);
     EXPECT_EQ(0, gesture_event_count_);
     Reset();
 
     widget->Close();
-    EXPECT_FALSE(WmShell::Get()->IsSystemModalWindowOpen());
+    EXPECT_FALSE(ShellPort::Get()->IsSystemModalWindowOpen());
 
     GenerateEvents(window.get());
 
     EXPECT_EQ(2, mouse_event_count_);
     EXPECT_EQ(3, scroll_event_count_);
     EXPECT_EQ(4, touch_event_count_);
     EXPECT_EQ(10, gesture_event_count_);
   }
 
  private:
@@ skipping 40 matching lines @@
 
 // Make sure that events are properly blocked in multi displays environment.
 TEST_F(SystemModalContainerLayoutManagerTest, BlockEventsInMultiDisplays) {
   UpdateDisplay("500x500, 500x500");
   InputTestDelegate delegate;
   delegate.RunTest(this);
 }
 
 }  // namespace test
 }  // namespace ash