ash: Remove ash::Shelf in favor of ash::WmShelf

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/shelf.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "base/logging.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
 // static
 WmShelf* WmShelf::ForWindow(WmWindow* window) {
   return window->GetRootWindowController()->GetShelf();
 }
 
-void WmShelf::SetShelf(Shelf* shelf) {
-  DCHECK(!shelf_);
-  DCHECK(shelf);
-  shelf_ = shelf;
-  DCHECK(shelf_layout_manager_);
-  shelf_locking_manager_.reset(new ShelfLockingManager(this));
-  // When the shelf is created the alignment is unlocked. Chrome will update the
-  // alignment later from preferences.
-  alignment_ = SHELF_ALIGNMENT_BOTTOM;
-}
-
-void WmShelf::ClearShelf() {
-  DCHECK(shelf_);
-  shelf_locking_manager_.reset();
-  shelf_ = nullptr;
-}
-
 void WmShelf::SetShelfLayoutManager(ShelfLayoutManager* manager) {
   DCHECK(!shelf_layout_manager_);
   DCHECK(manager);
   shelf_layout_manager_ = manager;
   shelf_layout_manager_->AddObserver(this);
   DCHECK(manager->shelf_widget());
   shelf_widget_ = manager->shelf_widget();
 }
 
+void WmShelf::CreateShelf() {
+  DCHECK(shelf_layout_manager_);
+  DCHECK(shelf_widget_);
+  DCHECK(!shelf_view_);
+  shelf_view_ = shelf_widget_->CreateShelfView();
+  shelf_locking_manager_.reset(new ShelfLockingManager(this));
+  // When the shelf is created the alignment is unlocked. Chrome will update the
+  // alignment later from preferences.
+  alignment_ = SHELF_ALIGNMENT_BOTTOM;
+  // NOTE: The delegate may access WmShelf.
+  WmShell::Get()->shelf_delegate()->OnShelfCreated(this);
+}
+
+void WmShelf::DestroyShelf() {
+  DCHECK(shelf_view_);
+  shelf_locking_manager_.reset();
+  shelf_view_ = nullptr;
+  WmShell::Get()->shelf_delegate()->OnShelfDestroyed(this);
+}
+
+bool WmShelf::IsShelfCreated() const {
+  return !!shelf_view_;
+}
+
 WmWindow* WmShelf::GetWindow() {
   // Use |shelf_layout_manager_| to access ShelfWidget because it is set before
   // before the Shelf instance is available.
   return WmLookup::Get()->GetWindowForWidget(
       shelf_layout_manager_->shelf_widget());
 }
 
 void WmShelf::SetAlignment(ShelfAlignment alignment) {
   DCHECK(shelf_layout_manager_);
+  DCHECK(shelf_locking_manager_);
 
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_->is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_->set_stored_alignment(alignment);
     return;
   }
 
@@ skipping 64 matching lines @@
 
 WmDimmerView* WmShelf::CreateDimmerView(bool disable_animations_for_test) {
   return nullptr;
 }
 
 bool WmShelf::IsDimmed() const {
   return shelf_layout_manager_->shelf_widget()->GetDimsShelf();
 }
 
 bool WmShelf::IsVisible() const {
-  return shelf_->shelf_widget()->IsShelfVisible();
+  return shelf_widget_->IsShelfVisible();
 }
 
 void WmShelf::UpdateVisibilityState() {
   if (shelf_layout_manager_)
     shelf_layout_manager_->UpdateVisibilityState();
 }
 
 ShelfVisibilityState WmShelf::GetVisibilityState() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state()
                                : SHELF_HIDDEN;
@@ skipping 84 matching lines @@
 
 void WmShelf::SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds) {
   shelf_layout_manager_->OnKeyboardBoundsChanging(bounds);
 }
 
 ShelfLockingManager* WmShelf::GetShelfLockingManagerForTesting() {
   return shelf_locking_manager_.get();
 }
 
 ShelfView* WmShelf::GetShelfViewForTesting() {
-  return shelf_->shelf_view_for_testing();
+  return shelf_view_;
 }
 
 WmShelf::WmShelf() {}
 
 WmShelf::~WmShelf() {}
 
 void WmShelf::WillDeleteShelfLayoutManager() {
   DCHECK(shelf_layout_manager_);
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
@@ skipping 11 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   BackgroundAnimatorChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnBackgroundTypeChanged(background_type, change_type));
 }
 
 }  // namespace ash