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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/extended_desktop_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/drag_drop/drag_drop_tracker_unittest.cc ('k') | ash/high_contrast/high_contrast_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 1f5c7090c8050198dafc830235f33053d61634b0..001902b64faee2a8167da2c48948a91eed89977e 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
@@ -309,24 +309,24 @@ TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT);
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
- EXPECT_EQ(root_windows[1], WmWindowAura::GetAuraWindow(
+ EXPECT_EQ(root_windows[1], WmWindow::GetAuraWindow(
wm::GetRootWindowAt(gfx::Point(-400, 100))));
- EXPECT_EQ(root_windows[1], WmWindowAura::GetAuraWindow(
- wm::GetRootWindowAt(gfx::Point(-1, 100))));
- EXPECT_EQ(root_windows[0], WmWindowAura::GetAuraWindow(
- wm::GetRootWindowAt(gfx::Point(0, 300))));
- EXPECT_EQ(root_windows[0], WmWindowAura::GetAuraWindow(
- wm::GetRootWindowAt(gfx::Point(700, 300))));
+ EXPECT_EQ(root_windows[1],
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(-1, 100))));
+ EXPECT_EQ(root_windows[0],
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(0, 300))));
+ EXPECT_EQ(root_windows[0],
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(700, 300))));
// Zero origin.
EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(0, 0))));
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(0, 0))));
// Out of range point should return the nearest root window
- EXPECT_EQ(root_windows[1], WmWindowAura::GetAuraWindow(
- wm::GetRootWindowAt(gfx::Point(-600, 0))));
- EXPECT_EQ(root_windows[0], WmWindowAura::GetAuraWindow(
- wm::GetRootWindowAt(gfx::Point(701, 100))));
+ EXPECT_EQ(root_windows[1],
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(-600, 0))));
+ EXPECT_EQ(root_windows[0],
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(701, 100))));
}
TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
@@ -339,44 +339,34 @@ TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
// Containing rect.
- EXPECT_EQ(root_windows[1],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(-300, 10, 50, 50))));
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(100, 10, 50, 50))));
+ EXPECT_EQ(root_windows[1], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(-300, 10, 50, 50))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(100, 10, 50, 50))));
// Intersecting rect.
- EXPECT_EQ(root_windows[1],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(-200, 0, 300, 300))));
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(-100, 0, 300, 300))));
+ EXPECT_EQ(root_windows[1], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(-200, 0, 300, 300))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(-100, 0, 300, 300))));
// Zero origin.
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(0, 0, 0, 0))));
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(0, 0, 1, 1))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(0, 0, 0, 0))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(0, 0, 1, 1))));
// Empty rect.
- EXPECT_EQ(root_windows[1],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(-400, 100, 0, 0))));
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(100, 100, 0, 0))));
+ EXPECT_EQ(root_windows[1], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(-400, 100, 0, 0))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(100, 100, 0, 0))));
// Out of range rect should return the primary root window.
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(-600, -300, 50, 50))));
- EXPECT_EQ(root_windows[0],
- WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(0, 1000, 50, 50))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(-600, -300, 50, 50))));
+ EXPECT_EQ(root_windows[0], WmWindow::GetAuraWindow(wm::GetRootWindowMatching(
+ gfx::Rect(0, 1000, 50, 50))));
}
TEST_F(ExtendedDesktopTest, Capture) {
« no previous file with comments | « ash/drag_drop/drag_drop_tracker_unittest.cc ('k') | ash/high_contrast/high_contrast_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698