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

Unified Diff: ui/views/mus/desktop_window_tree_host_mus.cc

Issue 2538633002: Adds a couple more properties to the property converter (Closed)
Patch Set: merge again Created 4 years, 1 month 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 | « ui/views/mus/desktop_window_tree_host_mus.h ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/desktop_window_tree_host_mus.cc
diff --git a/ui/views/mus/desktop_window_tree_host_mus.cc b/ui/views/mus/desktop_window_tree_host_mus.cc
index 2ce885e0183274ba062e73e119ffaa1435d235fa..73264c77dd32e052240b9420b6e79eb2ac2a740d 100644
--- a/ui/views/mus/desktop_window_tree_host_mus.cc
+++ b/ui/views/mus/desktop_window_tree_host_mus.cc
@@ -130,6 +130,22 @@ DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() {
desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
}
+// static
+int DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
+ WidgetDelegate* delegate) {
+ if (!delegate)
+ return ui::mojom::kResizeBehaviorNone;
+
+ int32_t behavior = ui::mojom::kResizeBehaviorNone;
+ if (delegate->CanResize())
+ behavior |= ui::mojom::kResizeBehaviorCanResize;
+ if (delegate->CanMaximize())
+ behavior |= ui::mojom::kResizeBehaviorCanMaximize;
+ if (delegate->CanMinimize())
+ behavior |= ui::mojom::kResizeBehaviorCanMinimize;
+ return behavior;
+}
+
bool DesktopWindowTreeHostMus::IsDocked() const {
return window()->GetProperty(aura::client::kShowStateKey) ==
ui::SHOW_STATE_DOCKED;
@@ -541,6 +557,10 @@ void DesktopWindowTreeHostMus::SizeConstraintsChanged() {
widget->widget_delegate()->CanMinimize());
window()->SetProperty(aura::client::kCanResizeKey,
widget->widget_delegate()->CanResize());
+ // TODO: replace above keys with kResizeBehaviorKey. http://crbug.com/669290.
+ window()->SetProperty(
+ aura::client::kResizeBehaviorKey,
+ GetResizeBehaviorFromDelegate(widget->widget_delegate()));
}
void DesktopWindowTreeHostMus::OnWindowManagerFrameValuesChanged() {
« no previous file with comments | « ui/views/mus/desktop_window_tree_host_mus.h ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698