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

Unified Diff: ui/views/widget/desktop_aura/desktop_screen_x11_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
Index: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
index 65fdeee7aa367274806508e13182465fa74e5f1a..15d8bd4c3b4a8982e34eec755987abdb7782751d 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
@@ -9,6 +9,7 @@
#include <memory>
#include "base/macros.h"
+#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
@@ -313,7 +314,8 @@ TEST_F(DesktopScreenX11Test, DoubleClickHeaderMaximizes) {
native_widget->set_window_component(HTCAPTION);
aura::Window* window = widget->GetNativeWindow();
- window->SetProperty(aura::client::kCanMaximizeKey, true);
+ window->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorCanMaximize);
// Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
DesktopWindowTreeHost* rwh =
@@ -338,7 +340,8 @@ TEST_F(DesktopScreenX11Test, DoubleClickTwoDifferentTargetsDoesntMaximizes) {
static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
aura::Window* window = widget->GetNativeWindow();
- window->SetProperty(aura::client::kCanMaximizeKey, true);
+ window->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorCanMaximize);
// Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
DesktopWindowTreeHost* rwh =
@@ -367,7 +370,8 @@ TEST_F(DesktopScreenX11Test, RightClickDuringDoubleClickDoesntMaximize) {
static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
aura::Window* window = widget->GetNativeWindow();
- window->SetProperty(aura::client::kCanMaximizeKey, true);
+ window->SetProperty(aura::client::kResizeBehaviorKey,
+ ui::mojom::kResizeBehaviorCanMaximize);
// Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
DesktopWindowTreeHost* rwh = static_cast<DesktopWindowTreeHost*>(
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/views/widget/desktop_aura/x11_window_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698