ash: Move AppList support to ShelfWidget, expose ShelfWidget in 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"
@@ skipping 29 matching lines @@
   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();

[James Cook, 2016/08/29 22:39:17]

I created a new member here because I wanted outside callers to use
shelf_widget() instead of GetShelfWidget(), since ShelfWidget will be created
and owned here shortly.

[msw, 2016/08/29 22:58:08]

Acknowledged.

 }
 
 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) {
@@ skipping 183 matching lines @@
 }
 
 ShelfLockingManager* WmShelf::GetShelfLockingManagerForTesting() {
   return shelf_locking_manager_.get();
 }
 
 ShelfView* WmShelf::GetShelfViewForTesting() {
   return shelf_->shelf_view_for_testing();
 }
 
-ShelfWidget* WmShelf::GetShelfWidgetForTesting() {
-  return shelf_layout_manager_->shelf_widget();
-}
-
 WmShelf::WmShelf() {}
 
 WmShelf::~WmShelf() {}
 
 void WmShelf::WillDeleteShelfLayoutManager() {
   DCHECK(shelf_layout_manager_);
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 void WmShelf::WillChangeVisibilityState(ShelfVisibilityState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     WillChangeVisibilityState(new_state));
 }
 
 void WmShelf::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnAutoHideStateChanged(new_state));
 }
 
 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