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

Unified Diff: ash/common/wm/wm_types.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/wm_types.h ('k') | ash/metrics/user_metrics_recorder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/wm_types.cc
diff --git a/ash/common/wm/wm_types.cc b/ash/common/wm/wm_types.cc
index 50337fb9dd141c7e92bc6f3dca2848bfdd9d716f..2e35f990b79da488eeb7a8ca988922b74c8b26bd 100644
--- a/ash/common/wm/wm_types.cc
+++ b/ash/common/wm/wm_types.cc
@@ -38,6 +38,7 @@ ui::WindowShowState ToWindowShowState(WindowStateType type) {
return ui::SHOW_STATE_INACTIVE;
case WINDOW_STATE_TYPE_FULLSCREEN:
case WINDOW_STATE_TYPE_PINNED:
+ case WINDOW_STATE_TYPE_TRUSTED_PINNED:
return ui::SHOW_STATE_FULLSCREEN;
case WINDOW_STATE_TYPE_END:
NOTREACHED();
@@ -49,7 +50,8 @@ ui::WindowShowState ToWindowShowState(WindowStateType type) {
bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) {
return type == WINDOW_STATE_TYPE_MAXIMIZED ||
type == WINDOW_STATE_TYPE_FULLSCREEN ||
- type == WINDOW_STATE_TYPE_PINNED;
+ type == WINDOW_STATE_TYPE_PINNED ||
+ type == WINDOW_STATE_TYPE_TRUSTED_PINNED;
}
} // namespace wm
« no previous file with comments | « ash/common/wm/wm_types.h ('k') | ash/metrics/user_metrics_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698