ash: Use session_manager::SessionState

ash/common/system/chromeos/palette/palette_tray.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/common/system/chromeos/palette/palette_tray.h"
 
+#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 51 matching lines @@
 const int kHorizontalPaddingBetweenTitleEntries = 2;
 
 // Color of the separator.
 const SkColor kPaletteSeparatorColor = SkColorSetARGB(0x1E, 0x00, 0x00, 0x00);
 
 // Returns true if we are in a user session that can show the stylus tools.
 bool IsInUserSession() {
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   return !session_state_delegate->IsUserSessionBlocked() &&
-         session_state_delegate->GetSessionState() ==
-             SessionStateDelegate::SESSION_STATE_ACTIVE &&
+         session_state_delegate->GetSessionState() == SessionState::ACTIVE &&
          WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
              LoginStatus::KIOSK_APP;
 }
 
 // Returns the font used by the title view.
 const gfx::FontList& GetTitleFont() {
   // TODO(tdanderson|jdufault): Use TrayPopupItemStyle instead.
   return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
       2, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::MEDIUM);
 }
@@ skipping 172 matching lines @@
   return true;
 }
 
 bool PaletteTray::ContainsPointInScreen(const gfx::Point& point) {
   if (icon_ && icon_->GetBoundsInScreen().Contains(point))
     return true;
 
   return bubble_ && bubble_->bubble_view()->GetBoundsInScreen().Contains(point);
 }
 
-void PaletteTray::SessionStateChanged(
-    SessionStateDelegate::SessionState state) {
+void PaletteTray::SessionStateChanged(SessionState state) {
   UpdateIconVisibility();
 }
 
 void PaletteTray::OnLockStateChanged(bool locked) {
   UpdateIconVisibility();
 
   // The user can eject the stylus during the lock screen transition, which will
   // open the palette. Make sure to close it if that happens.
   if (locked)
     HidePalette();
@@ skipping 173 matching lines @@
   } else {
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(IsInUserSession());
 }
 
 }  // namespace ash