Clean up SessionStateDelegate in chrome

chrome/browser/ui/ash/system_tray_client.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 "chrome/browser/ui/ash/system_tray_client.h"
 
 #include "ash/common/login_status.h"
-#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
+#include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/service_manager_connection.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "net/base/escape.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
@@ skipping 107 matching lines @@
 }
 
 // static
 int SystemTrayClient::GetDialogParentContainerId() {
   const ash::LoginStatus login_status = GetUserLoginStatus();
   if (login_status == ash::LoginStatus::NOT_LOGGED_IN ||
       login_status == ash::LoginStatus::LOCKED) {
     return ash::kShellWindowId_LockSystemModalContainer;
   }
 
-  // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
-  if (chrome::IsRunningInMash())
-    return ash::kShellWindowId_SystemModalContainer;
-
-  ash::WmShell* wm_shell = ash::WmShell::Get();
-  const bool session_started =
-      wm_shell->GetSessionStateDelegate()->IsActiveUserSessionStarted();
+  session_manager::SessionManager* const session_manager =
+      session_manager::SessionManager::Get();
+  const bool session_started = session_manager->IsSessionStarted();
   const bool is_in_secondary_login_screen =
-      wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
+      session_manager->IsInSecondaryLoginScreen();
 
   if (!session_started || is_in_secondary_login_screen)
     return ash::kShellWindowId_LockSystemModalContainer;
 
   return ash::kShellWindowId_SystemModalContainer;
 }
 
 // static
 Widget* SystemTrayClient::CreateUnownedDialogWidget(
     views::WidgetDelegate* widget_delegate) {
@@ skipping 89 matching lines @@
 }
 
 void SystemTrayClient::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowPolicy(displayer.browser());
 }
 
 void SystemTrayClient::ShowNetworkConfigure(const std::string& network_id) {
   // UI is not available at the lock screen.
-  // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
-  if (!chrome::IsRunningInMash() &&
-      ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked()) {
+  if (session_manager::SessionManager::Get()->IsScreenLocked())
     return;
-  }
 
   // Dialog will default to the primary display.
   chromeos::NetworkConfigView::ShowForNetworkId(network_id,
                                                 nullptr /* parent */);
 }
 
 void SystemTrayClient::ShowNetworkCreate(const std::string& type) {
   int container_id = GetDialogParentContainerId();
   if (type == shill::kTypeCellular) {
     chromeos::ChooseMobileNetworkDialog::ShowDialogInContainer(container_id);
@@ skipping 13 matching lines @@
       chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
   if (!profile)
     return;
 
   // Request that the third-party VPN provider show its "add network" dialog.
   chromeos::VpnServiceFactory::GetForBrowserContext(profile)
       ->SendShowAddDialogToExtension(extension_id);
 }
 
 void SystemTrayClient::ShowNetworkSettings(const std::string& network_id) {
-  if (!chrome::IsRunningInMash()) {
-    // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
-    if (!LoginState::Get()->IsUserLoggedIn() ||
-        ash::WmShell::Get()
-            ->GetSessionStateDelegate()
-            ->IsInSecondaryLoginScreen())
-      return;
+  if (!LoginState::Get()->IsUserLoggedIn() ||
+      session_manager::SessionManager::Get()->IsInSecondaryLoginScreen()) {
+    return;
   }
 
   std::string page = chrome::kInternetOptionsSubPage;
   if (!network_id.empty())
     page += "?guid=" + net::EscapeUrlEncodedData(network_id, true);
   content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
   ShowSettingsSubPageForActiveUser(page);
 }
 
 void SystemTrayClient::ShowProxySettings() {
@@ skipping 39 matching lines @@
     chromeos::system::SystemClock* clock) {
   system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock());
 }
 
 void SystemTrayClient::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED, type);
   HandleUpdateAvailable();
 }