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

Unified Diff: ash/wm/workspace/workspace_window_resizer_unittest.cc

Issue 2897993003: chromeos: converts WindowResizer to aura::Window (Closed)
Patch Set: remove include from exo Created 3 years, 7 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/workspace/workspace_window_resizer.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index fff2e8700d42d34730d784a3378d593fbaafe0a2..0cb2ba1ab17cffbe66f92b612cb66a326db5075b 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -136,8 +136,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
const gfx::Point& point_in_parent,
int window_component) {
WindowResizer* resizer =
- CreateWindowResizer(WmWindow::Get(window), point_in_parent,
- window_component,
+ CreateWindowResizer(window, point_in_parent, window_component,
aura::client::WINDOW_MOVE_SOURCE_MOUSE)
.release();
workspace_resizer_ = WorkspaceWindowResizer::GetInstanceForTest();
@@ -151,8 +150,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
const std::vector<aura::Window*>& attached_windows) {
wm::WindowState* window_state = wm::GetWindowState(window);
window_state->CreateDragDetails(point_in_parent, window_component, source);
- return WorkspaceWindowResizer::Create(
- window_state, WmWindow::FromAuraWindows(attached_windows));
+ return WorkspaceWindowResizer::Create(window_state, attached_windows);
}
PhantomWindowController* snap_phantom_window_controller() const {
@@ -549,8 +547,7 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
{
gfx::Rect expected_bounds_in_parent(
- wm::GetDefaultLeftSnappedWindowBoundsInParent(
- WmWindow::Get(window_.get())));
+ wm::GetDefaultLeftSnappedWindowBoundsInParent(window_.get()));
std::unique_ptr<WindowResizer> resizer(
CreateResizerForTest(window_.get(), gfx::Point(), HTCAPTION));
@@ -567,8 +564,7 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
// Try the same with the right side.
{
gfx::Rect expected_bounds_in_parent(
- wm::GetDefaultRightSnappedWindowBoundsInParent(
- WmWindow::Get(window_.get())));
+ wm::GetDefaultRightSnappedWindowBoundsInParent(window_.get()));
std::unique_ptr<WindowResizer> resizer(
CreateResizerForTest(window_.get(), gfx::Point(), HTCAPTION));
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698