mash: Move SystemTrayDelegate ownership to WmShell

ash/system/chromeos/settings/tray_settings.cc

 // Copyright (c) 2012 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/system/chromeos/settings/tray_settings.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #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"
 #include "ash/system/tray/actionable_view.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 44 matching lines @@
       power_status_view_ = new ash::PowerStatusView(power_view_right_align);
       AddChildView(power_status_view_);
       OnPowerStatusChanged();
     }
   }
 
   ~SettingsDefaultView() override { PowerStatus::Get()->RemoveObserver(this); }
 
   // 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;
   }
 
   // Overridden from views::View.
   void Layout() override {
     views::View::Layout();
 
     if (label_ && power_status_view_) {
       // Let the box-layout do the layout first. Then move power_status_view_
       // to right align if it is created.
@@ skipping 42 matching lines @@
 }
 
 views::View* TraySettings::CreateTrayView(LoginStatus status) {
   return NULL;
 }
 
 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);
   return default_view_;
 }
 
 views::View* TraySettings::CreateDetailedView(LoginStatus status) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void TraySettings::DestroyTrayView() {
 }
 
 void TraySettings::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
 void TraySettings::DestroyDetailedView() {
 }
 
 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 }  // namespace ash