chromeos: Rename ash::WmShelf to Shelf

ash/shelf/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_SHELF_WM_SHELF_H_
-#define ASH_SHELF_WM_SHELF_H_
+#ifndef ASH_SHELF_SHELF_H_
+#define ASH_SHELF_SHELF_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_locking_manager.h"
 #include "base/observer_list.h"
 
 namespace aura {
@@ skipping 11 matching lines @@
 namespace ash {
 
 enum class AnimationChangeType;
 class ShelfBezelEventHandler;
 class ShelfLayoutManager;
 class ShelfLayoutManagerTest;
 class ShelfLockingManager;
 class ShelfView;
 class ShelfWidget;
 class StatusAreaWidget;
-class WmShelfObserver;
+class ShelfObserver;
 class WmWindow;
 
 // Controller for the shelf state. One per display, because each display might
 // have different shelf alignment, autohide, etc. Exists for the lifetime of the
 // root window controller.
-class ASH_EXPORT WmShelf : public ShelfLayoutManagerObserver {
+class ASH_EXPORT Shelf : public ShelfLayoutManagerObserver {
  public:
-  WmShelf();
-  ~WmShelf() override;
+  Shelf();
+  ~Shelf() override;
 
   // 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(aura::Window* window);
+  static Shelf* ForWindow(aura::Window* window);
 
   // Returns if shelf alignment options are enabled, and the user is able to
   // adjust the alignment (eg. not allowed in guest and supervised user modes).
   static bool CanChangeShelfAlignment();
 
   void CreateShelfWidget(WmWindow* root);
   void ShutdownShelfWidget();
   void DestroyShelfWidget();
 
   ShelfLayoutManager* shelf_layout_manager() const {
     return shelf_layout_manager_;
   }
 
   ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
 
   // TODO(jamescook): Eliminate this method.
   void NotifyShelfInitialized();
 
   // Returns the window showing the shelf.
   WmWindow* GetWindow();
 
   ShelfAlignment alignment() const { return alignment_; }
-  // TODO(jamescook): Replace with alignment().
-  ShelfAlignment GetAlignment() const { return alignment_; }

[msw, 2017/05/24 18:42:58]

nice!

   void SetAlignment(ShelfAlignment alignment);
 
   // Returns true if the shelf alignment is horizontal (i.e. at the bottom).
   bool IsHorizontalAlignment() const;
 
   // Returns a value based on shelf alignment.
   int SelectValueForShelfAlignment(int bottom, int left, int right) const;
 
   // Returns |horizontal| is shelf is horizontal, otherwise |vertical|.
   int PrimaryAxisValue(int horizontal, int vertical) const;
@@ skipping 34 matching lines @@
 
   // 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 AddObserver(ShelfObserver* observer);
+  void RemoveObserver(ShelfObserver* observer);
 
   void NotifyShelfIconPositionsChanged();
   StatusAreaWidget* GetStatusAreaWidget() const;
 
   void SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds);
   ShelfLockingManager* GetShelfLockingManagerForTesting();
   ShelfView* GetShelfViewForTesting();
 
  protected:
   // ShelfLayoutManagerObserver:
@@ skipping 13 matching lines @@
 
   std::unique_ptr<ShelfWidget> shelf_widget_;
 
   // These initial values hide the shelf until user preferences are available.
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_ALWAYS_HIDDEN;
 
   // Sets shelf alignment to bottom during login and screen lock.
   ShelfLockingManager shelf_locking_manager_;
 
-  base::ObserverList<WmShelfObserver> observers_;
+  base::ObserverList<ShelfObserver> observers_;
 
   // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
   // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216
   std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_;
 
   // Forwards touch gestures on a bezel sensor to the shelf.
   // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
   std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
 
-  DISALLOW_COPY_AND_ASSIGN(WmShelf);
+  DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SHELF_WM_SHELF_H_
+#endif  // ASH_SHELF_SHELF_H_