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 "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 63 matching lines @@
   uint32_t window_id_;
   base::string16 title_;
   UserWindowController* user_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
 };
 
 }  // namespace
 
 ShelfDelegateMus::ShelfDelegateMus(ShelfModel* model)
-    : model_(model), binding_(this) {
+    : model_(model), shelf_(nullptr), 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) {
+  shelf_ = shelf;
   ash::ShelfWidget* widget = shelf->shelf_widget();
   ash::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);
 
   ash::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);
 }
 
 void ShelfDelegateMus::OnShelfDestroyed(Shelf* shelf) {
-  NOTIMPLEMENTED();
+  DCHECK_EQ(shelf_, shelf);
+  shelf_ = nullptr;
+}
+
+void ShelfDelegateMus::OnAlignmentChanged(ShelfAlignment alignment) {
+  LOG(ERROR) << "MSW ShelfDelegateMus::OnShelfAlignmentChanged";
+  // TODO(msw): Need to update the preferred sizes...
+
+  // ash::ShelfWidget* widget = shelf_->shelf_widget();
+  // ash::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);
+
+  // ash::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);
+
+  shelf_layout_->SetAlignment(
+      static_cast<mash::wm::mojom::ShelfAlignment>(alignment));
+}
+
+void ShelfDelegateMus::OnAutoHideBehaviorChanged(
+    ShelfAutoHideBehavior auto_hide) {
+  LOG(ERROR) << "MSW ShelfDelegateMus::OnAutoHideBehaviorChanged";
+  shelf_layout_->SetAutoHideBehavior(
+      static_cast<mash::wm::mojom::ShelfAutoHideBehavior>(auto_hide));
 }
 
 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) {
   NOTIMPLEMENTED();
   return 0;
 }
 
 bool ShelfDelegateMus::HasShelfIDToAppIDMapping(ShelfID id) const {
   NOTIMPLEMENTED();
   return false;
@@ skipping 81 matching lines @@
   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);
 }
 
 }  // namespace sysui
 }  // namespace ash