| Index: ash/wm/screen_pinning_controller_unittest.cc
|
| diff --git a/ash/wm/screen_pinning_controller_unittest.cc b/ash/wm/screen_pinning_controller_unittest.cc
|
| index a29fb3ce45dc63262fc4a87852dd4d785f16eaa5..590f4941c1cc7a7e035bf87c265e5c06a8582c27 100644
|
| --- a/ash/wm/screen_pinning_controller_unittest.cc
|
| +++ b/ash/wm/screen_pinning_controller_unittest.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include <vector>
|
|
|
| -#include "ash/aura/wm_window_aura.h"
|
| #include "ash/common/accelerators/accelerator_controller.h"
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm/wm_event.h"
|
| @@ -44,13 +43,13 @@ TEST_F(ScreenPinningControllerTest, OnlyOnePinnedWindow) {
|
| wm::ActivateWindow(w1);
|
|
|
| wm::PinWindow(w1, /* trusted */ false);
|
| - EXPECT_TRUE(WmWindowAura::Get(w1)->GetWindowState()->IsPinned());
|
| - EXPECT_FALSE(WmWindowAura::Get(w2)->GetWindowState()->IsPinned());
|
| + EXPECT_TRUE(WmWindow::Get(w1)->GetWindowState()->IsPinned());
|
| + EXPECT_FALSE(WmWindow::Get(w2)->GetWindowState()->IsPinned());
|
|
|
| // Prohibit to pin two (or more) windows.
|
| wm::PinWindow(w2, /* trusted */ false);
|
| - EXPECT_TRUE(WmWindowAura::Get(w1)->GetWindowState()->IsPinned());
|
| - EXPECT_FALSE(WmWindowAura::Get(w2)->GetWindowState()->IsPinned());
|
| + EXPECT_TRUE(WmWindow::Get(w1)->GetWindowState()->IsPinned());
|
| + EXPECT_FALSE(WmWindow::Get(w2)->GetWindowState()->IsPinned());
|
| }
|
|
|
| TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
|
| @@ -73,7 +72,7 @@ TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
|
| {
|
| wm::ActivateWindow(w2);
|
| const wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
|
| - WmWindowAura::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| + WmWindow::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| }
|
| {
|
| // Verify that w1 is still in front of w2.
|
| @@ -89,7 +88,7 @@ TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
|
| {
|
| wm::ActivateWindow(w2);
|
| const wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
|
| - WmWindowAura::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| + WmWindow::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| }
|
| {
|
| // Verify that w1 is still in front of w2.
|
| @@ -105,7 +104,7 @@ TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
|
| {
|
| wm::ActivateWindow(w2);
|
| const wm::WMEvent event(wm::WM_EVENT_TOGGLE_MAXIMIZE);
|
| - WmWindowAura::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| + WmWindow::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| }
|
| {
|
| // Verify that w1 is still in front of w2.
|
| @@ -121,7 +120,7 @@ TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
|
| {
|
| wm::ActivateWindow(w2);
|
| const wm::WMEvent event(wm::WM_EVENT_TOGGLE_MAXIMIZE);
|
| - WmWindowAura::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| + WmWindow::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| }
|
| {
|
| // Verify that w1 is still in front of w2.
|
| @@ -134,13 +133,13 @@ TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
|
| }
|
|
|
| // Restore w1.
|
| - WmWindowAura::Get(w1)->GetWindowState()->Restore();
|
| + WmWindow::Get(w1)->GetWindowState()->Restore();
|
|
|
| // Now, fullscreen-ize w2 should put it in front of w1.
|
| {
|
| wm::ActivateWindow(w2);
|
| const wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
|
| - WmWindowAura::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| + WmWindow::Get(w2)->GetWindowState()->OnWMEvent(&event);
|
| }
|
| {
|
| // Verify that w1 is still in front of w2.
|
|
|