Move more from WmShell to Shell

ash/common/system/chromeos/session/logout_button_tray.cc

 // Copyright 2014 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/session/logout_button_tray.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/session/logout_confirmation_controller.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_utils.h"
 #include "ash/common/system/user/login_status.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/events/event.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
@@ skipping 46 matching lines @@
 
 void LogoutButtonTray::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   if (sender != button_) {
     TrayBackgroundView::ButtonPressed(sender, event);
     return;
   }
 
   if (dialog_duration_ <= base::TimeDelta()) {
     // Sign out immediately if |dialog_duration_| is non-positive.
-    WmShell::Get()->system_tray_controller()->SignOut();
-  } else if (WmShell::Get()->logout_confirmation_controller()) {
-    WmShell::Get()->logout_confirmation_controller()->ConfirmLogout(
+    Shell::Get()->system_tray_controller()->SignOut();
+  } else if (Shell::Get()->logout_confirmation_controller()) {
+    Shell::Get()->logout_confirmation_controller()->ConfirmLogout(
         base::TimeTicks::Now() + dialog_duration_);
   }
 }
 
 void LogoutButtonTray::OnShowLogoutButtonInTrayChanged(bool show) {
   show_logout_button_in_tray_ = show;
   UpdateVisibility();
 }
 
 void LogoutButtonTray::OnLogoutDialogDurationChanged(base::TimeDelta duration) {
@@ skipping 23 matching lines @@
     button_->SetText(base::string16());
     button_->SetAccessibleName(title);
     button_->SetImage(views::LabelButton::STATE_NORMAL,
                       gfx::CreateVectorIcon(kShelfLogoutIcon, kTrayIconColor));
     button_->SetMinSize(gfx::Size(kTrayItemSize, kTrayItemSize));
   }
   UpdateVisibility();
 }
 
 }  // namespace ash