Move more from WmShell to Shell

ash/common/shelf/shelf_widget.cc

 // Copyright 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/common/shelf/shelf_widget.h"
 
 #include "ash/animation/animation_change_type.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/app_list_button.h"
@@ skipping 152 matching lines @@
   background_animator_.PaintBackground(
       shelf_layout_manager_->GetShelfBackgroundType(),
       AnimationChangeType::IMMEDIATE);
 
   views::Widget::AddObserver(this);
 }
 
 ShelfWidget::~ShelfWidget() {
   // Must call Shutdown() before destruction.
   DCHECK(!status_area_widget_);
-  WmShell::Get()->focus_cycler()->RemoveWidget(this);
+  Shell::Get()->focus_cycler()->RemoveWidget(this);
   SetFocusCycler(nullptr);
   RemoveObserver(this);
   background_animator_.RemoveObserver(delegate_view_);
   background_animator_.RemoveObserver(this);
 }
 
 void ShelfWidget::CreateStatusAreaWidget(WmWindow* status_container) {
   DCHECK(status_container);
   DCHECK(!status_area_widget_);
   // TODO(jamescook): Move ownership to RootWindowController.
   status_area_widget_ = new StatusAreaWidget(status_container, wm_shelf_);
   status_area_widget_->CreateTrayViews();
   if (WmShell::Get()->session_controller()->IsActiveUserSessionStarted())
     status_area_widget_->Show();
-  WmShell::Get()->focus_cycler()->AddWidget(status_area_widget_);
+  Shell::Get()->focus_cycler()->AddWidget(status_area_widget_);
   background_animator_.AddObserver(status_area_widget_);
   status_container->SetLayoutManager(
       base::MakeUnique<StatusAreaLayoutManager>(this));
 }
 
 void ShelfWidget::SetPaintsBackground(ShelfBackgroundType background_type,
                                       AnimationChangeType change_type) {
   background_animator_.PaintBackground(background_type, change_type);
 }
 
@@ skipping 34 matching lines @@
 
   shelf_view_ =
       new ShelfView(WmShell::Get()->shelf_model(),
                     WmShell::Get()->shelf_delegate(), wm_shelf_, this);
   shelf_view_->Init();
   GetContentsView()->AddChildView(shelf_view_);
   return shelf_view_;
 }
 
 void ShelfWidget::PostCreateShelf() {
-  SetFocusCycler(WmShell::Get()->focus_cycler());
+  SetFocusCycler(Shell::Get()->focus_cycler());
 
   // Ensure the newly created |shelf_| gets current values.
   background_animator_.NotifyObserver(this);
 
   // TODO(jamescook): The IsActiveUserSessionStarted() check may not be needed
   // because the shelf is only created after the first user session is active.
   // The ShelfView seems to always be visible after login. At the lock screen
   // the shelf is hidden because its container is hidden. During auto-hide it is
   // hidden because ShelfWidget is transparent. Some of the ShelfView visibility
   // code could be simplified. http://crbug.com/674773
@@ skipping 33 matching lines @@
 void ShelfWidget::Shutdown() {
   // Shutting down the status area widget may cause some widgets (e.g. bubbles)
   // to close, so uninstall the ShelfLayoutManager event filters first. Don't
   // reset the pointer until later because other widgets (e.g. app list) may
   // access it later in shutdown.
   if (shelf_layout_manager_)
     shelf_layout_manager_->PrepareForShutdown();
 
   if (status_area_widget_) {
     background_animator_.RemoveObserver(status_area_widget_);
-    WmShell::Get()->focus_cycler()->RemoveWidget(status_area_widget_);
+    Shell::Get()->focus_cycler()->RemoveWidget(status_area_widget_);
     status_area_widget_->Shutdown();
     status_area_widget_ = nullptr;
   }
 
   CloseNow();
 }
 
 void ShelfWidget::UpdateIconPositionForPanel(WmWindow* panel) {
   if (!shelf_view_)
     return;
@@ skipping 42 matching lines @@
   if (shelf_view_)
     shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash