mash: Create and show a shelf in mash.

ash/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_SHELF_SHELF_WIDGET_H_
 #define ASH_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_types.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 class FocusCycler;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfView;
 class StatusAreaWidget;
-class WmShelfAura;
+class WmShelf;
 class WmWindow;
 
 class ASH_EXPORT ShelfWidget : public views::Widget,
                                public views::WidgetObserver,
                                public ShelfBackgroundAnimatorObserver,
                                public ShelfLayoutManagerObserver {
  public:
   ShelfWidget(WmWindow* shelf_container,
               WmWindow* status_container,
-              WmShelfAura* wm_shelf_aura);
+              WmShelf* wm_shelf);
   ~ShelfWidget() override;
 
   // Returns if shelf alignment option is enabled, and the user is able to
   // adjust the alignment (guest and supervised mode users cannot for example).
   static bool ShelfAlignmentAllowed();
 
   void OnShelfAlignmentChanged();
 
   // DEPRECATED: Prefer WmShelf::GetAlignment().
   ShelfAlignment GetAlignment() const;
@@ skipping 57 matching lines @@
   // ShelfBackgroundAnimatorObserver overrides:
   void UpdateShelfItemBackground(int alpha) override;
 
   // ShelfLayoutManagerObserver overrides:
   void WillDeleteShelfLayoutManager() override;
 
  private:
   class DelegateView;
   friend class DelegateView;
 
-  WmShelfAura* wm_shelf_aura_;
+  WmShelf* wm_shelf_;
 
-  // Owned by the shelf container's aura::Window.
+  // 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_SHELF_SHELF_WIDGET_H_