mash: Preliminary support for shelf auto-hide

ash/mus/shelf_delegate_mus.cc

 // 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.
 
 #include "ash/mus/shelf_delegate_mus.h"
 
 #include <memory>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
@@ skipping 175 matching lines @@
   ::shell::Connector* connector =
       views::WindowManagerConnection::Get()->connector();
   connector->ConnectToInterface("mojo:desktop_wm", &shelf_layout_);
   connector->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);
   user_window_controller_->AddUserWindowObserver(
       binding_.CreateInterfacePtrAndBind());
 }
 
 ShelfDelegateMus::~ShelfDelegateMus() {}
 
+///////////////////////////////////////////////////////////////////////////////
+// ShelfDelegate:
+
 void ShelfDelegateMus::OnShelfCreated(Shelf* shelf) {
   SetShelfPreferredSizes(shelf);
 }
 
 void ShelfDelegateMus::OnShelfDestroyed(Shelf* shelf) {
   NOTIMPLEMENTED();
 }
 
 void ShelfDelegateMus::OnShelfAlignmentChanged(Shelf* shelf) {
   SetShelfPreferredSizes(shelf);
@@ skipping 12 matching lines @@
       static_cast<mash::shelf::mojom::AutoHideBehavior>(
           shelf->auto_hide_behavior());
   shelf_layout_->SetAutoHideBehavior(behavior);
 
   observers_.ForAllPtrs(
       [behavior](mash::shelf::mojom::ShelfObserver* observer) {
         observer->OnAutoHideBehaviorChanged(behavior);
       });
 }
 
+void ShelfDelegateMus::OnShelfAutoHideStateChanged(Shelf* shelf) {
+  // Push the new preferred size to the window manager. For example, when the
+  // shelf is auto-hidden it becomes a very short "light bar".
+  SetShelfPreferredSizes(shelf);
+}
+
+void ShelfDelegateMus::OnShelfVisibilityStateChanged(Shelf* shelf) {
+  SetShelfPreferredSizes(shelf);
+}
+
 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) {
   if (app_id_to_shelf_id_.count(app_id))
     return app_id_to_shelf_id_[app_id];
   return 0;
 }
 
 bool ShelfDelegateMus::HasShelfIDToAppIDMapping(ShelfID id) const {
   return shelf_id_to_app_id_.count(id) != 0;
 }
 
 const std::string& ShelfDelegateMus::GetAppIDForShelfID(ShelfID id) {
   if (shelf_id_to_app_id_.count(id))
     return shelf_id_to_app_id_[id];
   return base::EmptyString();
 }
 
 void ShelfDelegateMus::PinAppWithID(const std::string& app_id) {
   NOTIMPLEMENTED();
 }
 
 bool ShelfDelegateMus::IsAppPinned(const std::string& app_id) {
   NOTIMPLEMENTED();
   return false;
 }
 
 void ShelfDelegateMus::UnpinAppWithID(const std::string& app_id) {
   NOTIMPLEMENTED();
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// mash::shelf::mojom::ShelfController:
+
 void ShelfDelegateMus::AddObserver(
     mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) {
   mash::shelf::mojom::ShelfObserverAssociatedPtr observer_ptr;
   observer_ptr.Bind(std::move(observer));
   // Notify the observer of the current state.
   Shelf* shelf = Shelf::ForPrimaryDisplay();
   observer_ptr->OnAlignmentChanged(
       static_cast<mash::shelf::mojom::Alignment>(shelf->alignment()));
   observer_ptr->OnAutoHideBehaviorChanged(
       static_cast<mash::shelf::mojom::AutoHideBehavior>(
@@ skipping 177 matching lines @@
   DCHECK(iter != model_->items().end());
   ShelfItem item = *iter;
   item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
   model_->Set(index, item);
 }
 
 void ShelfDelegateMus::SetShelfPreferredSizes(Shelf* shelf) {
   ShelfWidget* widget = shelf->shelf_widget();
   ShelfLayoutManager* layout_manager = widget->shelf_layout_manager();
   mus::Window* window = aura::GetMusWindow(widget->GetNativeWindow());
-  gfx::Size size = layout_manager->GetIdealBounds().size();
+  gfx::Size size = layout_manager->GetPreferredSize();
   window->SetSharedProperty<gfx::Size>(
       mus::mojom::WindowManager::kPreferredSize_Property, size);
 
   StatusAreaWidget* status_widget = widget->status_area_widget();
   mus::Window* status_window =
       aura::GetMusWindow(status_widget->GetNativeWindow());
   gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();
   status_window->SetSharedProperty<gfx::Size>(
       mus::mojom::WindowManager::kPreferredSize_Property, status_size);
 }
 
 }  // namespace sysui
 }  // namespace ash