Promotes more accessors 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"
@@ skipping 18 matching lines @@
   // Base font size + 2 = 14.
   // TODO(estade): should this 2 be shared with other tray views? See
   // crbug.com/623987
   button->AdjustFontSize(2);
   button_ = button;
 
   // Since LogoutButtonTray has a red background and it is distinguished
   // by itself, no separator is needed on its right side.
   set_separator_visibility(false);
   tray_container()->AddChildView(button_);
-  WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
+  Shell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
-  WmShell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this);
+  Shell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this);
 }
 
 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   // We must first update the button so that
   // TrayBackgroundView::SetShelfAlignment() can lay it out correctly.
   UpdateButtonTextAndImage(login_status_, alignment);
   TrayBackgroundView::SetShelfAlignment(alignment);
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
@@ skipping 53 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