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

Unified Diff: ash/wm/window_state.cc

Issue 613563002: Make WindowState::CanMinimize() take into account WidgetDelegate::CanMinimize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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: ash/wm/window_state.cc
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index e95dc4060222015b22b6c1f0da4b5486fd5b6e00..827fa1aff3f958514676b7687b7699bc5718f4a3 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -153,15 +153,7 @@ bool WindowState::CanMaximize() const {
}
bool WindowState::CanMinimize() const {
- RootWindowController* controller = RootWindowController::ForWindow(window_);
- if (!controller)
- return false;
- aura::Window* lockscreen =
- controller->GetContainer(kShellWindowId_LockScreenContainersContainer);
- if (lockscreen->Contains(window_))
- return false;
-
- return true;
+ return window()->GetProperty(aura::client::kCanMinimizeKey);
}
bool WindowState::CanResize() const {
« no previous file with comments | « ash/wm/toplevel_window_event_handler_unittest.cc ('k') | chrome/browser/chromeos/login/ui/login_web_dialog_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698