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

Unified Diff: ash/wm/ash_focus_rules_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/test/ash_test_base.cc ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_focus_rules_unittest.cc
diff --git a/ash/wm/ash_focus_rules_unittest.cc b/ash/wm/ash_focus_rules_unittest.cc
index f8e461f4dcb67ebaac4b0aa782053c2e14d60a62..faabf2d7e3a75e5f61a420401dd8f289577a8856 100644
--- a/ash/wm/ash_focus_rules_unittest.cc
+++ b/ash/wm/ash_focus_rules_unittest.cc
@@ -14,6 +14,7 @@
#include "ash/wm/lock_state_controller.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
+#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/window_parenting_client.h"
#include "ui/views/test/widget_test.h"
@@ -132,8 +133,10 @@ class LockScreenAshFocusRulesTest : public AshTestBase {
aura::client::ParentWindowWithContext(window, container,
gfx::Rect(0, 0, 400, 400));
- window->SetProperty(aura::client::kCanMaximizeKey, true);
- window->SetProperty(aura::client::kCanMinimizeKey, true);
+ window->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorCanMaximize |
+ ui::mojom::kResizeBehaviorCanMinimize |
+ ui::mojom::kResizeBehaviorCanResize);
return window;
}
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698