ash: Remove ash::Shelf in favor of ash::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,
                                public ShelfBackgroundAnimatorObserver,
                                public ShelfLayoutManagerObserver {
@@ skipping 19 matching lines @@
 
   // Hide the shelf behind a black bar during e.g. a user transition when |hide|
   // is true. The |animation_time_ms| will be used as animation duration.
   void HideShelfBehindBlackBar(bool hide, int animation_time_ms);
   bool IsShelfHiddenBehindBlackBar() const;
 
   // Causes shelf items to be slightly dimmed (e.g. when a window is maximized).
   void SetDimsShelf(bool dimming);
   bool GetDimsShelf() const;
 
-  // TODO(jamescook): Eliminate these.
-  Shelf* shelf() { return shelf_; }
-  void set_shelf(Shelf* shelf) { shelf_ = shelf; }
-
   ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
   StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
 
   ShelfView* CreateShelfView();
   void PostCreateShelf();
 
   // Set visibility of the shelf.
   void SetShelfVisibility(bool visible);
   bool IsShelfVisible() const;
 
@@ skipping 48 matching lines @@
   void WillDeleteShelfLayoutManager() override;
 
  private:
   class DelegateView;
   friend class DelegateView;
 
   WmShelf* wm_shelf_;
 
   // Owned by the shelf container's window.
   ShelfLayoutManager* shelf_layout_manager_;
-  // Owned by the root window controller.
-  Shelf* shelf_;
   StatusAreaWidget* status_area_widget_;
 
   // |delegate_view_| is the contents view of this widget and is cleaned up
   // during CloseChildWindows of the associated RootWindowController.
   DelegateView* delegate_view_;
   // View containing the shelf items. Owned by the views hierarchy.
   ShelfView* shelf_view_;
   ShelfBackgroundAnimator background_animator_;
   bool activating_as_fallback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_WIDGET_H_