ash: Move AppList support to ShelfWidget, expose ShelfWidget in WmShelf

ash/common/shelf/wm_shelf.h

 // 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.
 
 #ifndef ASH_COMMON_SHELF_WM_SHELF_H_
 #define ASH_COMMON_SHELF_WM_SHELF_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 31 matching lines @@
 
   void SetShelf(Shelf* shelf);
   void ClearShelf();
   Shelf* shelf() const { return shelf_; }
 
   virtual void SetShelfLayoutManager(ShelfLayoutManager* manager);
   ShelfLayoutManager* shelf_layout_manager() const {
     return shelf_layout_manager_;
   }
 
+  ShelfWidget* shelf_widget() { return shelf_widget_; }
+
   // Returns the window showing the shelf.
   WmWindow* GetWindow();
 
   ShelfAlignment alignment() const { return alignment_; }
   // TODO(jamescook): Replace with alignment().
   ShelfAlignment GetAlignment() const { return alignment_; }
   void SetAlignment(ShelfAlignment alignment);
 
   // Returns true if the shelf alignment is horizontal (i.e. at the bottom).
   bool IsHorizontalAlignment() const;
@@ skipping 64 matching lines @@
 
   void AddObserver(WmShelfObserver* observer);
   void RemoveObserver(WmShelfObserver* observer);
 
   void NotifyShelfIconPositionsChanged();
   StatusAreaWidget* GetStatusAreaWidget() const;
 
   void SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds);
   ShelfLockingManager* GetShelfLockingManagerForTesting();
   ShelfView* GetShelfViewForTesting();
-  ShelfWidget* GetShelfWidgetForTesting();
 
  protected:
   WmShelf();
   ~WmShelf() override;
 
   // ShelfLayoutManagerObserver:
   void WillDeleteShelfLayoutManager() override;
   void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
   void OnBackgroundUpdated(ShelfBackgroundType background_type,
                            BackgroundAnimatorChangeType change_type) override;
 
  private:
   // Legacy shelf controller. Null before login and in secondary display init.
   // Instance lifetimes are managed by ash::RootWindowController and WmShelfMus.
   Shelf* shelf_ = nullptr;
 
   // Layout manager for the shelf container window. Instances are constructed by
   // ShelfWidget and lifetimes are managed by the container windows themselves.
   ShelfLayoutManager* shelf_layout_manager_ = nullptr;
 
+  // TODO(jamescook): Move ShelfWidget ownership here.
+  ShelfWidget* shelf_widget_ = nullptr;
+
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
 
   // Sets shelf alignment to bottom during login and screen lock.
   std::unique_ptr<ShelfLockingManager> shelf_locking_manager_;
 
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   base::ObserverList<WmShelfObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_WM_SHELF_H_