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

Unified Diff: ash/mus/non_client_frame_controller.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/common/wm/window_state.cc ('k') | ash/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index 382f0d9aeb677ee50834b1ae129c03c8b57bcd41..63c84bdaa47165cd2d929b04840ba7066efee1db 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -398,21 +398,18 @@ base::string16 NonClientFrameController::GetWindowTitle() const {
}
bool NonClientFrameController::CanResize() const {
- return window_ &&
- (GetResizeBehavior(window_) & ui::mojom::kResizeBehaviorCanResize) !=
- 0;
+ return window_ && (::ash::mus::GetResizeBehavior(window_) &
+ ui::mojom::kResizeBehaviorCanResize);
}
bool NonClientFrameController::CanMaximize() const {
- return window_ &&
- (GetResizeBehavior(window_) & ui::mojom::kResizeBehaviorCanMaximize) !=
- 0;
+ return window_ && (::ash::mus::GetResizeBehavior(window_) &
+ ui::mojom::kResizeBehaviorCanMaximize);
}
bool NonClientFrameController::CanMinimize() const {
- return window_ &&
- (GetResizeBehavior(window_) & ui::mojom::kResizeBehaviorCanMinimize) !=
- 0;
+ return window_ && (::ash::mus::GetResizeBehavior(window_) &
+ ui::mojom::kResizeBehaviorCanMinimize);
}
bool NonClientFrameController::ShouldShowWindowTitle() const {
« no previous file with comments | « ash/common/wm/window_state.cc ('k') | ash/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698