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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/wm_shelf.cc

Issue 2829813002: cros: Move IsUserSupervised and IsUserChild off SystemTrayDelegate (Closed)
Patch Set: review comments Created 3 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 | « ash/session/session_controller_unittest.cc ('k') | ash/system/supervised/tray_supervised_user.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/wm_shelf.cc
diff --git a/ash/shelf/wm_shelf.cc b/ash/shelf/wm_shelf.cc
index 79ee471ba3168d8540ea01b24c06fc38fbb9ab8f..bd0cbd65dbe757d9708de4f9cedfa0a94660ec75 100644
--- a/ash/shelf/wm_shelf.cc
+++ b/ash/shelf/wm_shelf.cc
@@ -8,6 +8,7 @@
#include "ash/public/cpp/shelf_item_delegate.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
+#include "ash/session/session_controller.h"
#include "ash/shelf/shelf_bezel_event_handler.h"
#include "ash/shelf/shelf_controller.h"
#include "ash/shelf/shelf_layout_manager.h"
@@ -75,7 +76,7 @@ WmShelf* WmShelf::ForWindow(WmWindow* window) {
// static
bool WmShelf::CanChangeShelfAlignment() {
- if (Shell::Get()->system_tray_delegate()->IsUserSupervised())
+ if (Shell::Get()->session_controller()->IsUserSupervised())
return false;
LoginStatus login_status =
« no previous file with comments | « ash/session/session_controller_unittest.cc ('k') | ash/system/supervised/tray_supervised_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698