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

ash/common/shelf/shelf_widget.h

 // Copyright (c) 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.
 
 #ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_
 #define ASH_COMMON_SHELF_SHELF_WIDGET_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_background_animator.h"
 #include "ash/common/shelf/shelf_background_animator_observer.h"
 #include "ash/common/shelf/shelf_layout_manager_observer.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
+namespace app_list {
+class ApplicationDragAndDropHost;
+}
+
 namespace ash {
+class AppListButton;
 class FocusCycler;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfView;
 class StatusAreaWidget;
 class WmShelf;
 class WmWindow;
 
 class ASH_EXPORT ShelfWidget : public views::Widget,
                                public views::WidgetObserver,
@@ skipping 59 matching lines @@
 
   // Force the shelf to be presented in an undimmed state.
   void ForceUndimming(bool force);
 
   // See WmShelf::UpdateIconPositionForPanel().
   void UpdateIconPositionForPanel(WmWindow* panel);
 
   // See WmShelf::GetScreenBoundsOfItemIconForWindow().
   gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
 
+  // Returns the button that opens the app launcher.
+  AppListButton* GetAppListButton() const;
+
+  // Returns ApplicationDragAndDropHost for this shelf.

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

nit: 'Returns the'

[James Cook, 2016/08/29 23:49:25]

Done.

+  app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
+
   // Overridden from views::WidgetObserver:
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
 
   // A function to test the current alpha used by the dimming bar. If there is
   // no dimmer active, the function will return -1.
   int GetDimmingAlphaForTest();
 
   // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
   // the dimmer is inactive.
   gfx::Rect GetDimmerBoundsForTest();
@@ skipping 26 matching lines @@
   ShelfView* shelf_view_;
   ShelfBackgroundAnimator background_animator_;
   bool activating_as_fallback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_WIDGET_H_