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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_cycle_controller.cc

Issue 2072853002: Implement "pinned" mode in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linux build breakage Created 4 years, 6 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
« ash/wm/pinned_controller_unittest.cc ('K') | « ash/wm/pinned_controller_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | ash/wm/workspace_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_cycle_controller.cc
diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc
index c24b9e9ecd88885c9ce709cda7c186e9447f6bf4..b2060c5f1a942edba40cf63b1c74b5b505e0ebe9 100644
--- a/ash/wm/window_cycle_controller.cc
+++ b/ash/wm/window_cycle_controller.cc
@@ -6,6 +6,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm_shell.h"
#include "ash/metrics/user_metrics_recorder.h"
#include "ash/shell.h"
#include "ash/wm/window_cycle_list.h"
@@ -73,7 +74,8 @@ bool WindowCycleController::CanCycle() {
// Don't allow window cycling if the screen is locked or a modal dialog is
// open.
return !Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
- !Shell::GetInstance()->IsSystemModalWindowOpen();
+ !Shell::GetInstance()->IsSystemModalWindowOpen() &&
+ !WmShell::Get()->IsPinned();
}
void WindowCycleController::HandleCycleWindow(Direction direction) {
« ash/wm/pinned_controller_unittest.cc ('K') | « ash/wm/pinned_controller_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | ash/wm/workspace_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698