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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/dock/docked_window_resizer_unittest.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: unnecessary casts 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
« ash/mus/accelerators/accelerator_controller_unittest.cc ('K') | « ash/wm/dock/docked_window_layout_manager_unittest.cc ('k') | ash/wm/drag_window_controller.cc » ('j') | ash/wm/drag_window_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_resizer_unittest.cc
diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc
index d764ea805f7783e0f4964ebe4de8079605fa7de8..4e5361e22f0ac49e8dfdf0ff5918b30fb057569f 100644
--- a/ash/wm/dock/docked_window_resizer_unittest.cc
+++ b/ash/wm/dock/docked_window_resizer_unittest.cc
@@ -4,7 +4,6 @@
#include "ash/common/wm/dock/docked_window_resizer.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/ash_switches.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
@@ -14,6 +13,7 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
@@ -76,7 +76,7 @@ class DockedWindowResizerTest
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
&delegate_, window_type_, 0, bounds);
if (window_type_ == ui::wm::WINDOW_TYPE_PANEL) {
- WmWindow* wm_window = WmWindowAura::Get(window);
+ WmWindow* wm_window = WmWindow::Get(window);
test::TestShelfDelegate::instance()->AddShelfItem(wm_window);
PanelLayoutManager::Get(wm_window)->Relayout();
}
@@ -110,7 +110,7 @@ class DockedWindowResizerTest
aura::Window* window,
const gfx::Point& point_in_parent,
int window_component) {
- return CreateWindowResizer(WmWindowAura::Get(window), point_in_parent,
+ return CreateWindowResizer(WmWindow::Get(window), point_in_parent,
window_component,
aura::client::WINDOW_MOVE_SOURCE_MOUSE)
.release();
@@ -549,7 +549,7 @@ TEST_P(DockedWindowResizerTest, AttachOneAutoHideShelf) {
->GetDisplayNearestWindow(w1.get())
.work_area();
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
// Docked window should be centered vertically in the work area.
EXPECT_EQ(work_area.CenterPoint().y(), w1->bounds().CenterPoint().y());
@@ -619,7 +619,7 @@ TEST_P(DockedWindowResizerTest, RevertDockedDragRevertsAttachment) {
std::unique_ptr<aura::Window> window(
CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(window.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(window.get()));
int previous_container_id = window->parent()->id();
// Drag the window out but revert the drag
ASSERT_NO_FATAL_FAILURE(DragStart(window.get()));
@@ -726,7 +726,7 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
@@ -793,7 +793,7 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
@@ -887,7 +887,7 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) {
w1->GetBoundsInScreen().x());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
// The first window should be docked.
EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().x(),
w1->GetBoundsInScreen().x());
@@ -981,7 +981,7 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
@@ -1118,7 +1118,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsSize) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
@@ -1168,7 +1168,7 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsDockedState) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
@@ -1225,7 +1225,7 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows) {
EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
// Dock width should be set to ideal width.
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(ideal_width(), docked_width(manager));
@@ -1288,7 +1288,7 @@ TEST_P(DockedWindowResizerTest, DragToShelf) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
@@ -1411,7 +1411,7 @@ TEST_P(DockedWindowResizerTest, SideSnapDocked) {
w1->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, w1->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(w1.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(w1.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(w1->bounds().width(), docked_width(manager));
EXPECT_TRUE(window_state->IsDocked());
@@ -1470,7 +1470,7 @@ TEST_P(DockedWindowResizerTest, MaximizedDuringDrag) {
window->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
DockedWindowLayoutManager* manager =
- DockedWindowLayoutManager::Get(WmWindowAura::Get(window.get()));
+ DockedWindowLayoutManager::Get(WmWindow::Get(window.get()));
EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
EXPECT_EQ(window->bounds().width(), docked_width(manager));
EXPECT_TRUE(window_state->IsDocked());
« ash/mus/accelerators/accelerator_controller_unittest.cc ('K') | « ash/wm/dock/docked_window_layout_manager_unittest.cc ('k') | ash/wm/drag_window_controller.cc » ('j') | ash/wm/drag_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698