mash: Preliminary support for shelf auto-hide

ash/mus/shelf_delegate_mus.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_MUS_SHELF_DELEGATE_MUS_H_
 #define ASH_MUS_SHELF_DELEGATE_MUS_H_
 
 #include <map>
 
 #include "ash/shelf/shelf_delegate.h"
+#include "ash/shelf/shelf_layout_manager_observer.h"
 #include "mash/shelf/public/interfaces/shelf.mojom.h"
 #include "mash/wm/public/interfaces/shelf_layout.mojom.h"
 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 namespace ash {
 
 class ShelfModel;
 
 namespace sysui {
 
+// Manages communication between the ash_sysui shelf, the window manager, and
+// the browser.
 class ShelfDelegateMus : public ShelfDelegate,
+                         public ShelfLayoutManagerObserver,
                          public mash::shelf::mojom::ShelfController,
                          public mash::wm::mojom::UserWindowObserver {
  public:
   explicit ShelfDelegateMus(ShelfModel* model);
   ~ShelfDelegateMus() override;
 
  private:
   // ShelfDelegate:
   void OnShelfCreated(Shelf* shelf) override;
   void OnShelfDestroyed(Shelf* shelf) override;
   void OnShelfAlignmentChanged(Shelf* shelf) override;
   void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override;
   ShelfID GetShelfIDForAppID(const std::string& app_id) override;
   bool HasShelfIDToAppIDMapping(ShelfID id) const override;
   const std::string& GetAppIDForShelfID(ShelfID id) override;
   void PinAppWithID(const std::string& app_id) override;
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
+  // ShelfLayoutManagerObserver:

[msw, 2016/05/24 20:46:55]

I wonder if this should be done through ShelfDelegate instead?
(that might reduce our reliance upon the ash ShelfLayoutManager)

[James Cook, 2016/05/25 00:25:43]

Done.

+  void DidChangeVisibilityState(ShelfLayoutManager* layout_manager,
+                                ShelfVisibilityState new_state) override;
+  void OnAutoHideStateChanged(ShelfLayoutManager* layout_manager,
+                              ShelfAutoHideState new_state) override;
+
   // mash::shelf::mojom::ShelfController:
   void AddObserver(
       mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override;
   void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
   void SetAutoHideBehavior(
       mash::shelf::mojom::AutoHideBehavior auto_hide) override;
   void PinItem(
       mash::shelf::mojom::ShelfItemPtr item,
       mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;
   void UnpinItem(const mojo::String& app_id) override;
@@ skipping 26 matching lines @@
   std::map<std::string, ShelfID> app_id_to_shelf_id_;
   std::map<ShelfID, std::string> shelf_id_to_app_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
 };
 
 }  // namespace sysui
 }  // namespace ash
 
 #endif  // ASH_MUS_SHELF_DELEGATE_MUS_H_