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

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

Issue 2780943002: Enables ScreenPinningController for mash/mus (Closed)
Patch Set: local Created 3 years, 9 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/common/wm/window_cycle_controller.cc
diff --git a/ash/common/wm/window_cycle_controller.cc b/ash/common/wm/window_cycle_controller.cc
index b3cd51caf66ac34e8d2f1ae92f89ab9bfe36fe77..f7bafc35cd8bdd7967f7fec5726ba5bf1d54b091 100644
--- a/ash/common/wm/window_cycle_controller.cc
+++ b/ash/common/wm/window_cycle_controller.cc
@@ -14,6 +14,7 @@
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
+#include "ash/wm/screen_pinning_controller.h"
#include "base/metrics/histogram_macros.h"
namespace ash {
@@ -40,7 +41,8 @@ bool WindowCycleController::CanCycle() {
// Prevent window cycling if the screen is locked or a modal dialog is open.
WmShell* wm_shell = WmShell::Get();
return !Shell::Get()->session_controller()->IsScreenLocked() &&
- !wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned();
+ !wm_shell->IsSystemModalWindowOpen() &&
+ !Shell::Get()->screen_pinning_controller()->IsPinned();
}
void WindowCycleController::HandleCycleWindow(Direction direction) {
« no previous file with comments | « ash/common/wm/overview/window_selector_controller.cc ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698