Support additional mash shelf alignments.

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 98 matching lines @@
   SkBitmap bitmap = mojo::ConvertTo<SkBitmap>(serialized_bitmap.storage());
   return GetShelfIconFromBitmap(bitmap);
 }
 
 }  // namespace
 
 ShelfDelegateMus::ShelfDelegateMus(ShelfModel* model)
     : model_(model), binding_(this) {
   mojo::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() {}
 
 void ShelfDelegateMus::OnShelfCreated(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();
-  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);
+  SetShelfPreferredSizes(shelf);
 }
 
 void ShelfDelegateMus::OnShelfDestroyed(Shelf* shelf) {
   NOTIMPLEMENTED();
 }
 
 void ShelfDelegateMus::OnShelfAlignmentChanged(Shelf* shelf) {
+  SetShelfPreferredSizes(shelf);
+  shelf_layout_->SetAlignment(
+      static_cast<mash::wm::mojom::ShelfAlignment>(shelf->GetAlignment()));
+
   observers_.ForAllPtrs([shelf](mash::shelf::mojom::ShelfObserver* observer) {
     observer->OnAlignmentChanged(
         static_cast<mash::shelf::mojom::Alignment>(shelf->GetAlignment()));
   });
 }
 
 void ShelfDelegateMus::OnShelfAutoHideBehaviorChanged(Shelf* shelf) {
+  shelf_layout_->SetAutoHideBehavior(
+      static_cast<mash::wm::mojom::ShelfAutoHideBehavior>(
+          shelf->auto_hide_behavior()));
+
   observers_.ForAllPtrs([shelf](mash::shelf::mojom::ShelfObserver* observer) {
     observer->OnAutoHideBehaviorChanged(
         static_cast<mash::shelf::mojom::AutoHideBehavior>(
             shelf->auto_hide_behavior()));
   });
 }
 
 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) {
   NOTIMPLEMENTED();
   return 0;
@@ skipping 150 matching lines @@
   ShelfID shelf_id = window_id_to_shelf_id_[window_id];
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
   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();
+  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