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

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

Issue 2542493002: Replace kCanMaximize/Minimize/Resize with kResizeBehavior. (Closed)
Patch Set: Fix int->bool compile issue. Created 4 years 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/ash_focus_rules_unittest.cc ('k') | ash/wm/lock_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index 4b719d77bc53b7426b4faf3dfece32155d51208c..344c1c38879fcbe1cf48db4e6149f89fab4f1f82 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -19,6 +19,7 @@
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/strings/string_number_conversions.h"
+#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
@@ -581,7 +582,8 @@ TEST_P(DockedWindowLayoutManagerTest, TwoWindowsWidthNew) {
// Tests that a first non-resizable window added to the dock is not resized.
TEST_P(DockedWindowLayoutManagerTest, TwoWindowsWidthNonResizableFirst) {
std::unique_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
- w1->SetProperty(aura::client::kCanResizeKey, false);
+ w1->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorNone);
std::unique_ptr<aura::Window> w2(CreateTestWindow(gfx::Rect(0, 0, 280, 202)));
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
// The first window should not get resized.
@@ -596,7 +598,8 @@ TEST_P(DockedWindowLayoutManagerTest, TwoWindowsWidthNonResizableFirst) {
TEST_P(DockedWindowLayoutManagerTest, TwoWindowsWidthNonResizableSecond) {
std::unique_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
std::unique_ptr<aura::Window> w2(CreateTestWindow(gfx::Rect(0, 0, 280, 202)));
- w2->SetProperty(aura::client::kCanResizeKey, false);
+ w2->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorNone);
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
// The first window should get resized to ideal width.
EXPECT_EQ(ideal_width(), w1->bounds().width());
« no previous file with comments | « ash/wm/ash_focus_rules_unittest.cc ('k') | ash/wm/lock_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698