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

Unified Diff: ash/common/shelf/shelf_layout_manager.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change 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
« no previous file with comments | « ash/common/session/session_state_observer.cc ('k') | ash/common/shelf/shelf_locking_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_layout_manager.cc
diff --git a/ash/common/shelf/shelf_layout_manager.cc b/ash/common/shelf/shelf_layout_manager.cc
index 044bcb3a64377d57b4f8d5a40c6d8d2ccf37e2ff..a1b146a650e9db98dbeb2de594b1b3351d4f25e0 100644
--- a/ash/common/shelf/shelf_layout_manager.cc
+++ b/ash/common/shelf/shelf_layout_manager.cc
@@ -11,7 +11,6 @@
#include "ash/animation/animation_change_type.h"
#include "ash/common/keyboard/keyboard_observer_register.h"
#include "ash/common/session/session_controller.h"
-#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/shelf_layout_manager_observer.h"
#include "ash/common/shelf/shelf_widget.h"
@@ -341,8 +340,8 @@ void ShelfLayoutManager::RemoveObserver(ShelfLayoutManagerObserver* observer) {
bool ShelfLayoutManager::ProcessGestureEvent(const ui::GestureEvent& event) {
// The gestures are disabled in the lock/login screen.
- SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
- if (!delegate->NumberOfLoggedInUsers() || delegate->IsScreenLocked())
+ SessionController* controller = WmShell::Get()->session_controller();
+ if (!controller->NumberOfLoggedInUsers() || controller->IsScreenLocked())
return false;
if (IsShelfHiddenForFullscreen())
@@ -438,7 +437,7 @@ void ShelfLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
// On login screen if keyboard has been just hidden, update bounds just once
// but ignore target_bounds.work_area_insets since shelf overlaps with login
// window.
- if (WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked() &&
+ if (WmShell::Get()->session_controller()->IsUserSessionBlocked() &&
keyboard_is_about_to_hide) {
WmWindow* window = WmWindow::Get(shelf_widget_->GetNativeWindow());
WmShell::Get()->SetDisplayWorkAreaInsets(window, gfx::Insets());
« no previous file with comments | « ash/common/session/session_state_observer.cc ('k') | ash/common/shelf/shelf_locking_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698