mash: Move TrayTracing to //ash/common/system/chromeos

ash/common/system/chromeos/tray_tracing.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 "ash/system/chromeos/tray_tracing.h"
+#include "ash/common/system/chromeos/tray_tracing.h"
 
 #include "ash/common/system/tray/actionable_view.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/system/tray/wm_system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
-#include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"

[msw, 2016/06/24 02:07:11]

nit: could we instead forward declare SystemTray here?

[James Cook, 2016/06/24 16:28:17]

Done.

-#include "ash/system/tray/system_tray_notifier.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 namespace tray {
@@ skipping 35 matching lines @@
 };
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::TrayTracing
 
 TrayTracing::TrayTracing(SystemTray* system_tray)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_TRACING),
       default_(NULL) {
-  DCHECK(Shell::GetInstance()->delegate());
   DCHECK(system_tray);
-  Shell::GetInstance()->system_tray_notifier()->AddTracingObserver(this);
+  WmShell::Get()->system_tray_notifier()->AddTracingObserver(this);
 }
 
 TrayTracing::~TrayTracing() {
-  Shell::GetInstance()->system_tray_notifier()->RemoveTracingObserver(this);
+  WmShell::Get()->system_tray_notifier()->RemoveTracingObserver(this);
 }
 
 void TrayTracing::SetTrayIconVisible(bool visible) {
   if (tray_view())
     tray_view()->SetVisible(visible);
 }
 
 bool TrayTracing::GetInitialVisibility() {
   return false;
 }
@@ skipping 14 matching lines @@
 }
 
 void TrayTracing::DestroyDetailedView() {
 }
 
 void TrayTracing::OnTracingModeChanged(bool value) {
   SetTrayIconVisible(value);
 }
 
 }  // namespace ash