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

Unified Diff: ash/wm/screen_pinning_controller_unittest.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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 | « ash/wm/screen_pinning_controller.cc ('k') | ash/wm/stacking_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ash/wm/screen_pinning_controller.cc ('k') | ash/wm/stacking_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698