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

Unified Diff: ash/common/wm/window_state.cc

Issue 2285633002: Add WM_EVENT_TRUSTED_PIN and WINDOW_STATE_TYPE_TRUSTED_PINNED to Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 3 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
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_window_state.cc ('k') | ash/common/wm/wm_event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/window_state.cc
diff --git a/ash/common/wm/window_state.cc b/ash/common/wm/window_state.cc
index aa8e4aa4ab396c4dad36b703d2e7b2f6c4b446a8..abcd56d2121d4439ac49bf1c6c8aa5e423bc6c17 100644
--- a/ash/common/wm/window_state.cc
+++ b/ash/common/wm/window_state.cc
@@ -75,8 +75,7 @@ bool WindowState::IsFullscreen() const {
bool WindowState::IsMaximizedOrFullscreenOrPinned() const {
return GetStateType() == WINDOW_STATE_TYPE_MAXIMIZED ||
- GetStateType() == WINDOW_STATE_TYPE_FULLSCREEN ||
- GetStateType() == WINDOW_STATE_TYPE_PINNED;
+ GetStateType() == WINDOW_STATE_TYPE_FULLSCREEN || IsPinned();
}
bool WindowState::IsSnapped() const {
@@ -85,7 +84,8 @@ bool WindowState::IsSnapped() const {
}
bool WindowState::IsPinned() const {
- return GetStateType() == WINDOW_STATE_TYPE_PINNED;
+ return GetStateType() == WINDOW_STATE_TYPE_PINNED ||
+ GetStateType() == WINDOW_STATE_TYPE_TRUSTED_PINNED;
}
bool WindowState::IsNormalStateType() const {
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_window_state.cc ('k') | ash/common/wm/wm_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698