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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/wm/window_cycle_controller.cc

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | « trunk/src/ash/wm/system_modal_container_layout_manager_unittest.cc ('k') | trunk/src/ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/wm/window_cycle_controller.cc
===================================================================
--- trunk/src/ash/wm/window_cycle_controller.cc (revision 194588)
+++ trunk/src/ash/wm/window_cycle_controller.cc (working copy)
@@ -6,8 +6,7 @@
#include <algorithm>
-#include "ash/session_state_delegate.h"
-#include "ash/shell.h"
+#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/activation_controller.h"
#include "ash/wm/window_cycle_list.h"
@@ -122,7 +121,7 @@
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() &&
+ return !Shell::GetInstance()->IsScreenLocked() &&
!Shell::GetInstance()->IsSystemModalWindowOpen();
}
« no previous file with comments | « trunk/src/ash/wm/system_modal_container_layout_manager_unittest.cc ('k') | trunk/src/ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698