mash: Move SystemTrayDelegate ownership to WmShell

ash/system/chromeos/settings/tray_settings.cc

Index: ash/system/chromeos/settings/tray_settings.cc
diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc
index a0ca04d602b09c2d65bcb9c7783d2d263c02e685..c15daefa6866ffc030e828548334eae6e60c41e0 100644
--- a/ash/system/chromeos/settings/tray_settings.cc
+++ b/ash/system/chromeos/settings/tray_settings.cc
@@ -8,6 +8,7 @@
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/power_status_view.h"
@@ -72,15 +73,15 @@ class SettingsDefaultView : public ActionableView,
 
   // Overridden from ash::ActionableView.
   bool PerformAction(const ui::Event& event) override {
-    bool userAddingRunning = ash::Shell::GetInstance()
-                                 ->session_state_delegate()
-                                 ->IsInSecondaryLoginScreen();
+    bool user_adding_running = Shell::GetInstance()

[msw, 2016/06/10 18:48:21]

nit: |adding_user| or |in_secondary_login| or inline?

[James Cook, 2016/06/10 20:20:32]

I went with adding_user, since that's what's actually happening. ("secondary
login" just sounds weird)

+                                   ->session_state_delegate()
+                                   ->IsInSecondaryLoginScreen();
 
     if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
-        login_status_ == LoginStatus::LOCKED || userAddingRunning)
+        login_status_ == LoginStatus::LOCKED || user_adding_running)

[msw, 2016/06/10 18:48:21]

nit: curlies

[James Cook, 2016/06/10 20:20:31]

Done.

       return false;
 
-    ash::Shell::GetInstance()->system_tray_delegate()->ShowSettings();
+    WmShell::Get()->system_tray_delegate()->ShowSettings();
     return true;
   }
 
@@ -143,7 +144,7 @@ views::View* TraySettings::CreateDefaultView(LoginStatus status) {
   if ((status == LoginStatus::NOT_LOGGED_IN || status == LoginStatus::LOCKED) &&
       !PowerStatus::Get()->IsBatteryPresent())
     return NULL;
-  if (!ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings())
+  if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings())
     return NULL;
   CHECK(default_view_ == NULL);
   default_view_ =  new tray::SettingsDefaultView(status);