ash: Move more code from Shelf to 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 18 matching lines @@
 class ShelfWidget;
 class StatusAreaWidget;
 class WmDimmerView;
 class WmShelfObserver;
 class WmWindow;
 
 // Controller for the shelf state. Exists for the lifetime of each root window
 // controller. Note that the shelf widget may not be created until after login.
 class ASH_EXPORT WmShelf : public ShelfLayoutManagerObserver {
  public:
+  // Returns the shelf for the display that |window| is on. Note that the shelf
+  // widget may not exist, or the shelf may not be visible.
+  static WmShelf* ForWindow(WmWindow* window);
+
   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_;
   }
 
   // Returns the window showing the shelf.
@@ skipping 43 matching lines @@
 
   void UpdateVisibilityState();
 
   ShelfVisibilityState GetVisibilityState() const;
 
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
 
   gfx::Rect GetUserWorkAreaBounds() const;
 
-  void UpdateIconPositionForWindow(WmWindow* window);
+  // Updates the icon position given the current window bounds. This is used
+  // when dragging panels to reposition them with respect to the other panels.
+  void UpdateIconPositionForPanel(WmWindow* window);
 
   // Returns the screen bounds of the item for the specified window. If there is
   // no item for the specified window an empty rect is returned.
   gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
 
+  // Launch a 0-indexed shelf item in the shelf. A negative index launches the
+  // last shelf item in the shelf.
+  static void LaunchShelfItem(int item_index);
+
+  // Activates the shelf item specified by the index in the list of shelf items.
+  static void ActivateShelfItem(int item_index);
+
   // Handles a gesture |event| coming from a source outside the shelf widget
   // (e.g. the status area widget). Allows support for behaviors like toggling
   // auto-hide with a swipe, even if that gesture event hits another window.
   // Returns true if the event was handled.
   bool ProcessGestureEvent(const ui::GestureEvent& event);
 
   void AddObserver(WmShelfObserver* observer);
   void RemoveObserver(WmShelfObserver* observer);
 
   void NotifyShelfIconPositionsChanged();
@@ skipping 32 matching lines @@
   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_