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

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

Issue 1913473002: Makes WorkspaceWindowResizer use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@root_controller_observer
Patch Set: fix exo again Created 4 years, 8 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 aac414ab59482c2b51ee3df0ff6b345803338601..8b254b2fc0ae1cfae7b66852cf1bc81bf45ef2be 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_manager_test_api.h"
+#include "ash/wm/aura/wm_window_aura.h"
#include "ash/wm/common/window_positioning_utils.h"
#include "ash/wm/common/wm_event.h"
#include "ash/wm/window_state.h"
@@ -144,11 +145,11 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
aura::Window* window,
const gfx::Point& point_in_parent,
int window_component) {
- WindowResizer* resizer = CreateWindowResizer(
- window,
- point_in_parent,
- window_component,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE).release();
+ WindowResizer* resizer =
+ CreateWindowResizer(wm::WmWindowAura::Get(window), point_in_parent,
+ window_component,
+ aura::client::WINDOW_MOVE_SOURCE_MOUSE)
+ .release();
workspace_resizer_ = WorkspaceWindowResizer::GetInstanceForTest();
return resizer;
}
@@ -160,7 +161,8 @@ 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, attached_windows);
+ return WorkspaceWindowResizer::Create(
+ window_state, wm::WmWindowAura::FromAuraWindows(attached_windows));
}
PhantomWindowController* snap_phantom_window_controller() const {
« 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