ash: Move more code from Shelf to WmShelf

ash/common/shelf/shelf.h

 // Copyright 2013 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_H_
 #define ASH_COMMON_SHELF_SHELF_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "base/macros.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
 }
 
 namespace gfx {
 class Rect;
 }
@@ skipping 22 matching lines @@
 
   // Return the shelf for the display that |window| is currently on, or a shelf
   // on primary display if the shelf per display feature is disabled. NULL if no
   // user is logged in yet.
   static Shelf* ForWindow(WmWindow* window);
 
   // For porting from Shelf to WmShelf.
   // TODO(jamescook): Remove this.
   WmShelf* wm_shelf() { return wm_shelf_; }
 
-  // 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);

[James Cook, 2016/08/24 23:44:25]

moved to ShelfWidget

-
-  // 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 UpdateIconPositionForWindow(WmWindow* window);
-
-  // Activates the the shelf item specified by the index in the list of shelf
-  // items.
-  void ActivateShelfItem(int index);

[James Cook, 2016/08/24 23:44:25]

moved to WmShelf

-
-  // Cycles the window focus linearly over the current shelf items.
-  void CycleWindowLinear(CycleDirection direction);

[James Cook, 2016/08/24 23:44:25]

dead code

-
   AppListButton* GetAppListButton() const;
 
-  // Launch a 0-indexed shelf item in the shelf.
-  // A negative index launches the last shelf item in the shelf.
-  void LaunchAppIndexAt(int item_index);
-
   ShelfWidget* shelf_widget() { return shelf_widget_; }
 
   // TODO(msw): ShelfLayoutManager should not be accessed externally.
   ShelfLayoutManager* shelf_layout_manager() {
     return shelf_widget_->shelf_layout_manager();
   }
 
-  // Returns rectangle bounding all visible shelf items. Used screen coordinate
-  // system.
-  gfx::Rect GetVisibleItemsBoundsInScreen() const;
-
   // Returns ApplicationDragAndDropHost for this shelf.
   app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
 
-  // Updates the background for the shelf items.
-  void UpdateShelfItemBackground(int alpha);

[James Cook, 2016/08/24 23:44:25]

dead

-
   ShelfView* shelf_view_for_testing() { return shelf_view_; }
 
  private:
   friend class test::ShelfTestAPI;
 
   // The shelf controller. Owned by the root window controller.
   WmShelf* wm_shelf_;
   ShelfWidget* shelf_widget_;
   ShelfView* shelf_view_;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_H_