Move more from WmShell to Shell

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/common/system/chromeos/tray_tracing.h"
 
 #include "ash/common/metrics/user_metrics_action.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.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 namespace tray {
@@ skipping 21 matching lines @@
 
     SetInkDropMode(InkDropHostView::InkDropMode::ON);
   }
 
   ~DefaultTracingView() override {}
 
  private:
   bool PerformAction(const ui::Event& event) override {
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_TRACING_DEFAULT_SELECTED);
-    WmShell::Get()->system_tray_controller()->ShowChromeSlow();
+    Shell::Get()->system_tray_controller()->ShowChromeSlow();
     CloseSystemBubble();
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(DefaultTracingView);
 };
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 34 matching lines @@
   default_ = NULL;
 }
 
 void TrayTracing::DestroyDetailedView() {}
 
 void TrayTracing::OnTracingModeChanged(bool value) {
   SetTrayIconVisible(value);
 }
 
 }  // namespace ash