Migrate simple ash Shell metrics users.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/shutdown_policy_observer.h"
 #include "ash/common/system/date/clock_observer.h"
 #include "ash/common/system/ime/ime_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/wm_system_tray_notifier.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/update_observer.h"
 #include "ash/common/system/volume_control_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/bluetooth/bluetooth_observer.h"
 #include "ash/system/chromeos/session/logout_button_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/user_observer.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/bind_helpers.h"
@@ skipping 102 matching lines @@
                     ash::IMEInfo* info) {
   info->id = ime.id();
   info->name = util.GetInputMethodLongName(ime);
   info->medium_name = util.GetInputMethodMediumName(ime);
   info->short_name = util.GetInputMethodShortName(ime);
   info->third_party = extension_ime_util::IsExtensionIME(ime.id());
 }
 
 gfx::NativeWindow GetNativeWindowByStatus(ash::LoginStatus login_status,
                                           bool session_started) {
-  bool isUserAddingRunning = ash::Shell::GetInstance()
-                                 ->session_state_delegate()
-                                 ->IsInSecondaryLoginScreen();
+  ash::WmShell* wm_shell = ash::WmShell::Get();
+  const bool is_in_secondary_login_screen =
+      wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
   int container_id =
       (!session_started || login_status == ash::LoginStatus::NOT_LOGGED_IN ||
-       login_status == ash::LoginStatus::LOCKED || isUserAddingRunning)
+       login_status == ash::LoginStatus::LOCKED || is_in_secondary_login_screen)
           ? ash::kShellWindowId_LockSystemModalContainer
           : ash::kShellWindowId_SystemModalContainer;
   return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                   container_id);
 }
 
 void BluetoothSetDiscoveringError() {
   LOG(ERROR) << "BluetoothSetDiscovering failed.";
 }
 
@@ skipping 74 matching lines @@
   ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
 
   g_browser_process->platform_part()->GetSystemClock()->AddObserver(this);
 
   OnSystemClockChanged(g_browser_process->platform_part()->GetSystemClock());
 
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&SystemTrayDelegateChromeOS::InitializeOnAdapterReady,
                  weak_ptr_factory_.GetWeakPtr()));
 
-  ash::Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(
-      this);
+  ash::WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->AddAudioObserver(this);
 
   BrowserList::AddObserver(this);
 }
 
 void SystemTrayDelegateChromeOS::Shutdown() {
 }
 
@@ skipping 36 matching lines @@
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
   g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this);
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
   input_method::InputMethodManager::Get()->RemoveObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
   bluetooth_adapter_->RemoveObserver(this);
-  ash::Shell::GetInstance()
-      ->session_state_delegate()
-      ->RemoveSessionStateObserver(this);
+  ash::WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(
+      this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->RemoveAudioObserver(this);
 
   BrowserList::RemoveObserver(this);
   StopObservingAppWindowRegistry();
   StopObservingCustodianInfoChanges();
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
@@ skipping 97 matching lines @@
 
 base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
   return clock_type_;
 }
 
 void SystemTrayDelegateChromeOS::ShowSettings() {
   ShowSettingsSubPageForActiveUser("");
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowSettings() {
+  ash::WmShell* wm_shell = ash::WmShell::Get();
   return ChromeUserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() &&
-         !ash::Shell::GetInstance()
-              ->session_state_delegate()
-              ->IsInSecondaryLoginScreen();
+         !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 void SystemTrayDelegateChromeOS::ShowDateSettings() {
   content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
   std::string sub_page =
       std::string(chrome::kSearchSubPage) + "#" +
       l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
   // Everybody can change the time zone (even though it is a device setting).
   ShowSettingsSubPageForActiveUser(sub_page);
 }
 
 void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
   SetTimeDialog::ShowDialog(GetNativeWindow());
 }
 
 void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
     const std::string& guid) {
-  bool userAddingRunning = ash::Shell::GetInstance()
-                               ->session_state_delegate()
-                               ->IsInSecondaryLoginScreen();
-
-  if (!LoginState::Get()->IsUserLoggedIn() || userAddingRunning)
-    return;
-  std::string page = chrome::kInternetOptionsSubPage;
-  if (!guid.empty())
-    page += "?guid=" + net::EscapeUrlEncodedData(guid, true);
-  content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
-  ShowSettingsSubPageForActiveUser(page);
+  ash::WmShell* wm_shell = ash::WmShell::Get();
+  if (LoginState::Get()->IsUserLoggedIn() &&
+      !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
+    std::string page = chrome::kInternetOptionsSubPage;
+    if (!guid.empty())
+      page += "?guid=" + net::EscapeUrlEncodedData(guid, true);
+    content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
+    ShowSettingsSubPageForActiveUser(page);
+  }
 }
 
 void SystemTrayDelegateChromeOS::ShowDisplaySettings() {
   content::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
   ShowSettingsSubPageForActiveUser(kDisplaySettingsSubPageName);
 }
 
 void SystemTrayDelegateChromeOS::ShowPowerSettings() {
   if (!(switches::PowerOverlayEnabled() ||
         (ash::PowerStatus::Get()->IsBatteryPresent() &&
@@ skipping 60 matching lines @@
   chrome::ShowPolicy(displayer.browser());
 }
 
 void SystemTrayDelegateChromeOS::ShowSupervisedUserInfo() {
   // TODO(antrim): find out what should we show in this case.
   // http://crbug.com/229762
 }
 
 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
   ash::LoginStatus status = GetUserLoginStatus();
-  bool userAddingRunning = ash::Shell::GetInstance()
-                               ->session_state_delegate()
-                               ->IsInSecondaryLoginScreen();
-
+  ash::WmShell* wm_shell = ash::WmShell::Get();
   if (status == ash::LoginStatus::NOT_LOGGED_IN ||
-      status == ash::LoginStatus::LOCKED || userAddingRunning) {
+      status == ash::LoginStatus::LOCKED ||
+      wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
     scoped_refptr<chromeos::HelpAppLauncher> help_app(
         new chromeos::HelpAppLauncher(GetNativeWindow()));
     help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
   } else {
     chrome::ScopedTabbedBrowserDisplayer displayer(
         ProfileManager::GetActiveUserProfile());
     chrome::ShowSingletonTab(displayer.browser(),
                              GURL(chrome::kLearnMoreEnterpriseURL));
   }
 }
 
 void SystemTrayDelegateChromeOS::ShowUserLogin() {
   ash::Shell* shell = ash::Shell::GetInstance();
+  ash::WmShell* wm_shell = ash::WmShell::Get();
   if (!shell->delegate()->IsMultiProfilesEnabled())
     return;
 
   // Only regular non-supervised users could add other users to current session.
   if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=
       user_manager::USER_TYPE_REGULAR) {
     return;
   }
 
   if (static_cast<int>(
           user_manager::UserManager::Get()->GetLoggedInUsers().size()) >=
-      shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers())
+      wm_shell->GetSessionStateDelegate()->GetMaximumNumberOfLoggedInUsers()) {
     return;
+  }
 
   // Launch sign in screen to add another user to current session.
   if (user_manager::UserManager::Get()
           ->GetUsersAllowedForMultiProfile()
           .size()) {
     // Don't show dialog if any logged in user in multi-profiles session
     // dismissed it.
     bool show_intro = true;
     const user_manager::UserList logged_in_users =
         user_manager::UserManager::Get()->GetLoggedInUsers();
@@ skipping 79 matching lines @@
 void SystemTrayDelegateChromeOS::ConnectToBluetoothDevice(
     const std::string& address) {
   device::BluetoothDevice* device = bluetooth_adapter_->GetDevice(address);
   if (!device || device->IsConnecting() ||
       (device->IsConnected() && device->IsPaired())) {
     return;
   }
   if (device->IsPaired() && !device->IsConnectable())
     return;
   if (device->IsPaired() || !device->IsPairable()) {
-    ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    ash::WmShell::Get()->RecordUserMetricsAction(
         ash::UMA_STATUS_AREA_BLUETOOTH_CONNECT_KNOWN_DEVICE);
     device->Connect(NULL,
                     base::Bind(&base::DoNothing),
                     base::Bind(&BluetoothDeviceConnectError));
   } else {  // Show paring dialog for the unpaired device.
-    ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    ash::WmShell::Get()->RecordUserMetricsAction(
         ash::UMA_STATUS_AREA_BLUETOOTH_CONNECT_UNKNOWN_DEVICE);
     BluetoothPairingDialog* dialog =
         new BluetoothPairingDialog(GetNativeWindow(), device);
     // The dialog deletes itself on close.
     dialog->Show();
   }
 }
 
 bool SystemTrayDelegateChromeOS::IsBluetoothDiscovering() {
   return bluetooth_adapter_->IsDiscovering();
@@ skipping 370 matching lines @@
   screen_locked_ = true;
   ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
 }
 
 void SystemTrayDelegateChromeOS::ScreenIsUnlocked() {
   screen_locked_ = false;
   ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
 }
 
 gfx::NativeWindow SystemTrayDelegateChromeOS::GetNativeWindow() const {
-  bool session_started = ash::Shell::GetInstance()
-                             ->session_state_delegate()
+  bool session_started = ash::WmShell::Get()
+                             ->GetSessionStateDelegate()
                              ->IsActiveUserSessionStarted();
   return GetNativeWindowByStatus(GetUserLoginStatus(), session_started);
 }
 
 // content::NotificationObserver implementation.
 void SystemTrayDelegateChromeOS::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
@@ skipping 254 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos