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

Unified Diff: ash/wm/workspace/workspace_window_resizer_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/workspace/workspace_layout_manager_unittest.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 45a6e68ceb3887615dea23b24c39514048cc0a90..5cb6db0ed662c95abe879a6ce5743bee09afe472 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -4,7 +4,6 @@
#include "ash/common/wm/workspace/workspace_window_resizer.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/ash_switches.h"
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/wm_shelf.h"
@@ -13,6 +12,7 @@
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm/workspace/phantom_window_controller.h"
#include "ash/common/wm/workspace_controller.h"
+#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
@@ -137,7 +137,7 @@ class WorkspaceWindowResizerTest : public test::AshMDTestBase {
const gfx::Point& point_in_parent,
int window_component) {
WindowResizer* resizer =
- CreateWindowResizer(WmWindowAura::Get(window), point_in_parent,
+ CreateWindowResizer(WmWindow::Get(window), point_in_parent,
window_component,
aura::client::WINDOW_MOVE_SOURCE_MOUSE)
.release();
@@ -153,7 +153,7 @@ class WorkspaceWindowResizerTest : public test::AshMDTestBase {
wm::WindowState* window_state = wm::GetWindowState(window);
window_state->CreateDragDetails(point_in_parent, window_component, source);
return WorkspaceWindowResizer::Create(
- window_state, WmWindowAura::FromAuraWindows(attached_windows));
+ window_state, WmWindow::FromAuraWindows(attached_windows));
}
PhantomWindowController* snap_phantom_window_controller() const {
@@ -554,7 +554,7 @@ TEST_P(WorkspaceWindowResizerTest, Edge) {
{
gfx::Rect expected_bounds_in_parent(
wm::GetDefaultLeftSnappedWindowBoundsInParent(
- WmWindowAura::Get(window_.get())));
+ WmWindow::Get(window_.get())));
std::unique_ptr<WindowResizer> resizer(
CreateResizerForTest(window_.get(), gfx::Point(), HTCAPTION));
@@ -572,7 +572,7 @@ TEST_P(WorkspaceWindowResizerTest, Edge) {
{
gfx::Rect expected_bounds_in_parent(
wm::GetDefaultRightSnappedWindowBoundsInParent(
- WmWindowAura::Get(window_.get())));
+ WmWindow::Get(window_.get())));
std::unique_ptr<WindowResizer> resizer(
CreateResizerForTest(window_.get(), gfx::Point(), HTCAPTION));
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698