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

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

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
Index: ash/wm/workspace/snap_sizer_unittest.cc
diff --git a/ash/wm/workspace/snap_sizer_unittest.cc b/ash/wm/workspace/snap_sizer_unittest.cc
index 8802242b80780cf4e43132951895586271cb75f4..efc008cda45532971c00b7792edb7d5d8eebd777 100644
--- a/ash/wm/workspace/snap_sizer_unittest.cc
+++ b/ash/wm/workspace/snap_sizer_unittest.cc
@@ -8,7 +8,7 @@
#include "ash/screen_ash.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_util.h"
+#include "ash/wm/window_state.h"
#include "base/command_line.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_window_delegate.h"
@@ -85,7 +85,8 @@ TEST_F(SnapSizerTest, MinimumSize) {
// It should be possible to snap a window with a minimum size.
delegate.set_minimum_size(gfx::Size(kWorkAreaBounds.width() - 1, 0));
- EXPECT_TRUE(ash::wm::CanSnapWindow(window.get()));
+ wm::WindowState* window_state = wm::GetWindowState(window.get());
+ EXPECT_TRUE(window_state->CanSnap());
SnapSizer::SnapWindow(window.get(), SnapSizer::RIGHT_EDGE);
gfx::Rect expected = gfx::Rect(kWorkAreaBounds.x() + 1,
kWorkAreaBounds.y(),
@@ -96,7 +97,7 @@ TEST_F(SnapSizerTest, MinimumSize) {
// It should not be possible to snap a window with a maximum size.
delegate.set_minimum_size(gfx::Size());
delegate.set_maximum_size(gfx::Size(kWorkAreaBounds.width() - 1, INT_MAX));
- EXPECT_FALSE(ash::wm::CanSnapWindow(window.get()));
+ EXPECT_FALSE(window_state->CanSnap());
}
// Test that repeadedly calling SnapSizer::SnapWindow() steps through the ideal

Powered by Google App Engine
This is Rietveld 408576698