Move yet more from WmShell to Shell

ash/common/shelf/wm_shelf.cc

 // Copyright 2016 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/wm_shelf.h"
 
 #include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
@@ skipping 123 matching lines @@
 void WmShelf::DestroyShelfWidget() {
   shelf_widget_.reset();
 }
 
 void WmShelf::CreateShelfView() {
   DCHECK(shelf_layout_manager_);
   DCHECK(shelf_widget_);
   DCHECK(!shelf_view_);
   shelf_view_ = shelf_widget_->CreateShelfView();
   shelf_locking_manager_.reset(new ShelfLockingManager(this));
-  WmShell::Get()->shelf_controller()->NotifyShelfCreated(this);
+  Shell::Get()->shelf_controller()->NotifyShelfCreated(this);
 }
 
 void WmShelf::ShutdownShelf() {
   DCHECK(shelf_view_);
   shelf_locking_manager_.reset();
   shelf_view_ = nullptr;
 }
 
 bool WmShelf::IsShelfInitialized() const {
   return !!shelf_view_;
@@ skipping 13 matching lines @@
   if (shelf_locking_manager_->is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_->set_stored_alignment(alignment);
     return;
   }
 
   alignment_ = alignment;
   // The ShelfWidget notifies the ShelfView of the alignment change.
   shelf_widget_->OnShelfAlignmentChanged();
   shelf_layout_manager_->LayoutShelf();
-  WmShell::Get()->shelf_controller()->NotifyShelfAlignmentChanged(this);
+  Shell::Get()->shelf_controller()->NotifyShelfAlignmentChanged(this);
   Shell::GetInstance()->NotifyShelfAlignmentChanged(
       GetWindow()->GetRootWindow());
 }
 
 bool WmShelf::IsHorizontalAlignment() const {
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return true;
     case SHELF_ALIGNMENT_LEFT:
@@ skipping 24 matching lines @@
   return IsHorizontalAlignment() ? horizontal : vertical;
 }
 
 void WmShelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   DCHECK(shelf_layout_manager_);
 
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;
 
   auto_hide_behavior_ = auto_hide_behavior;
-  WmShell::Get()->shelf_controller()->NotifyShelfAutoHideBehaviorChanged(this);
+  Shell::Get()->shelf_controller()->NotifyShelfAutoHideBehaviorChanged(this);
   Shell::GetInstance()->NotifyShelfAutoHideBehaviorChanged(
       GetWindow()->GetRootWindow());
 }
 
 ShelfAutoHideState WmShelf::GetAutoHideState() const {
   return shelf_layout_manager_->auto_hide_state();
 }
 
 void WmShelf::UpdateAutoHideState() {
   shelf_layout_manager_->UpdateAutoHideState();
@@ skipping 31 matching lines @@
 }
 
 gfx::Rect WmShelf::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   if (!shelf_widget_)
     return gfx::Rect();
   return shelf_widget_->GetScreenBoundsOfItemIconForWindow(window);
 }
 
 // static
 void WmShelf::LaunchShelfItem(int item_index) {
-  ShelfModel* shelf_model = WmShell::Get()->shelf_model();
+  ShelfModel* shelf_model = Shell::Get()->shelf_model();
   const ShelfItems& items = shelf_model->items();
   int item_count = shelf_model->item_count();
   int indexes_left = item_index >= 0 ? item_index : item_count;
   int found_index = -1;
 
   // Iterating until we have hit the index we are interested in which
   // is true once indexes_left becomes negative.
   for (int i = 0; i < item_count && indexes_left >= 0; i++) {
     if (items[i].type != TYPE_APP_LIST) {
       found_index = i;
       indexes_left--;
     }
   }
 
   // There are two ways how found_index can be valid: a.) the nth item was
   // found (which is true when indexes_left is -1) or b.) the last item was
   // requested (which is true when index was passed in as a negative number).
   if (found_index >= 0 && (indexes_left == -1 || item_index < 0)) {
     // Then set this one as active (or advance to the next item of its kind).
     ActivateShelfItem(found_index);
   }
 }
 
 // static
 void WmShelf::ActivateShelfItem(int item_index) {
-  ShelfModel* shelf_model = WmShell::Get()->shelf_model();
+  ShelfModel* shelf_model = Shell::Get()->shelf_model();
   const ShelfItem& item = shelf_model->items()[item_index];
   mojom::ShelfItemDelegate* item_delegate =
       shelf_model->GetShelfItemDelegate(item.id);
   std::unique_ptr<ui::Event> event = base::MakeUnique<ui::KeyEvent>(
       ui::ET_KEY_RELEASED, ui::VKEY_UNKNOWN, ui::EF_NONE);
   item_delegate->ItemSelected(std::move(event), display::kInvalidDisplayId,
                               LAUNCH_FROM_UNKNOWN, base::Bind(&NoopCallback));
 }
 
 bool WmShelf::ProcessGestureEvent(const ui::GestureEvent& event) {
@@ skipping 66 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   AnimationChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   for (auto& observer : observers_)
     observer.OnBackgroundTypeChanged(background_type, change_type);
 }
 
 }  // namespace ash