cros: Merge SystemTrayDelegate::GetUserLoginStatus

ash/shelf/wm_shelf.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/wm_shelf.h"
 
 #include "ash/public/cpp/config.h"
 #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"
 #include "ash/shelf/shelf_locking_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf_observer.h"
 #include "ash/shell.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm_window.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 41 matching lines @@
 // static
 WmShelf* WmShelf::ForWindow(WmWindow* window) {
   return window->GetRootWindowController()->GetShelf();
 }
 
 // static
 bool WmShelf::CanChangeShelfAlignment() {
   if (Shell::Get()->session_controller()->IsUserSupervised())
     return false;
 
-  LoginStatus login_status =
-      Shell::Get()->system_tray_delegate()->GetUserLoginStatus();
+  const LoginStatus login_status =
+      Shell::Get()->session_controller()->login_status();
 
   switch (login_status) {
     case LoginStatus::LOCKED:
     // Shelf alignment changes can be requested while being locked, but will
     // be applied upon unlock.
     case LoginStatus::USER:
     case LoginStatus::OWNER:
       return true;
     case LoginStatus::PUBLIC:
     case LoginStatus::SUPERVISED:
@@ skipping 281 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   AnimationChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   for (auto& observer : observers_)
     observer.OnBackgroundTypeChanged(background_type, change_type);
 }
 
 }  // namespace ash