ash: Refactor Shelf ownership and ShelfView creation

ash/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_SHELF_SHELF_H_
 #define ASH_SHELF_SHELF_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 17 matching lines @@
 
 namespace views {
 class View;
 }
 
 namespace ash {
 class AppListButton;
 class FocusCycler;
 class ShelfDelegate;
 class ShelfIconObserver;
-class ShelfModel;
 class ShelfView;
 class WmShelf;
 
 namespace test {
 class ShelfTestAPI;
 }
 
-// Controller for shelf state. All access to state (visibility, auto-hide, etc.)
-// should occur via this class.
+// Controller for shelf state.
+// DEPRECATED: WmShelf is replacing this class as part of the mus/mash refactor.
+// Use WmShelf for access to state (visibility, auto-hide, etc.).
 class ASH_EXPORT Shelf {
  public:
-  static const char kNativeViewName[];
-
-  Shelf(ShelfModel* model,
-        WmShelf* wm_shelf,
-        ShelfWidget* widget);
+  Shelf(WmShelf* wm_shelf, ShelfView* shelf_view, ShelfWidget* widget);
   ~Shelf();
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
   // Useful for tests. For production code use ForWindow() because the user may
   // have multiple displays.
   static Shelf* ForPrimaryDisplay();
 
   // 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(const WmWindow* window);
 
+  // DEPRECATED. Use WmShelf::GetAlignment() and SetAlignment().
   void SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
+  // DEPRECATED. Use WmShelf::GetAutoHideBehavior() and SetAutoHideBehavior().
   void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
   ShelfAutoHideState GetAutoHideState() const;
 
   ShelfVisibilityState GetVisibilityState() const;
 
   // Returns the screen bounds of the item for the specified window. If there is
@@ skipping 13 matching lines @@
 
   void AddIconObserver(ShelfIconObserver* observer);
   void RemoveIconObserver(ShelfIconObserver* observer);
 
   // Returns true if the shelf is showing a context menu.
   bool IsShowingMenu() const;
 
   // TODO(jamescook): Migrate this to ShelfWidget.
   bool IsShowingOverflowBubble() const;
 
-  void SetVisible(bool visible) const;
+  // TODO(jamescook): Migrate to ShelfWidget::IsShelfVisible().
   bool IsVisible() const;
 
   void SchedulePaint();
 
   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);
 
@@ skipping 31 matching lines @@
 
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_