Support additional mash shelf alignments.

mash/wm/window_manager_application.cc

 // Copyright 2015 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 "mash/wm/window_manager_application.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "mash/wm/accelerator_registrar_impl.h"
 #include "mash/wm/root_window_controller.h"
 #include "mash/wm/root_windows_observer.h"
+#include "mash/wm/shelf_layout.h"
 #include "mash/wm/user_window_controller_impl.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "ui/events/event.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/display_converter.h"
 
@@ skipping 33 matching lines @@
   ui_init_.reset(new ui::mojo::UIInit(
       views::GetDisplaysFromWindow(root_controller->root())));
   aura_init_.reset(new views::AuraInit(connector_, "mash_wm_resources.pak"));
 }
 
 void WindowManagerApplication::OnRootWindowControllerDoneInit(
     RootWindowController* root_controller) {
   // TODO(msw): figure out if this should be per display, or global.
   user_window_controller_->Initialize(root_controller);
   for (auto& request : user_window_controller_requests_)
-    user_window_controller_binding_.AddBinding(user_window_controller_.get(),
-                                               std::move(*request));
+    user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
+                                                std::move(*request));
   user_window_controller_requests_.clear();
 
+  // TODO(msw): figure out if this should be per display, or global.
+  if (root_controller == (*root_controllers_.begin())) {
+    ShelfLayout* shelf_layout =

[sky, 2016/04/13 23:44:11]

These casts make me nervous. I prefer GetShelfLayoutManager().

[msw, 2016/04/15 17:25:06]

Done (as a RootWindowController member, which still has a cast).

+        static_cast<ShelfLayout*>(root_controller->GetLayoutManagerForContainer(
+            mash::wm::mojom::Container::USER_SHELF));
+    for (auto& request : shelf_layout_requests_)
+      shelf_layout_bindings_.AddBinding(shelf_layout, std::move(*request));
+    shelf_layout_requests_.clear();
+  }
+
   FOR_EACH_OBSERVER(RootWindowsObserver, root_windows_observers_,
                     OnRootWindowControllerAdded(root_controller));
 }
 
 void WindowManagerApplication::OnRootWindowDestroyed(
     RootWindowController* root_controller) {
   root_controllers_.erase(root_controller);
   user_window_controller_.reset(nullptr);
 }
 
@@ skipping 30 matching lines @@
 
   mus::mojom::WindowManagerFactoryServicePtr wm_factory_service;
   connector_->ConnectToInterface("mojo:mus", &wm_factory_service);
   wm_factory_service->SetWindowManagerFactory(
       window_manager_factory_binding_.CreateInterfacePtrAndBind());
 
   user_window_controller_.reset(new UserWindowControllerImpl());
 }
 
 bool WindowManagerApplication::AcceptConnection(mojo::Connection* connection) {
-  connection->AddInterface<mash::wm::mojom::UserWindowController>(this);
+  connection->AddInterface<mojom::ShelfLayout>(this);
+  connection->AddInterface<mojom::UserWindowController>(this);
   connection->AddInterface<mus::mojom::AcceleratorRegistrar>(this);
   if (connection->GetRemoteIdentity().name() == "mojo:mash_session")
     connection->GetInterface(&session_);
   return true;
 }
 
 void WindowManagerApplication::Create(
     mojo::Connection* connection,
-    mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> request) {
+    mojo::InterfaceRequest<mojom::ShelfLayout> request) {
+  // TODO(msw): Handle multiple shelves (one per display).
   if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
-    user_window_controller_binding_.AddBinding(user_window_controller_.get(),
-                                               std::move(request));
+    ShelfLayout* shelf_layout = static_cast<ShelfLayout*>(
+        (*root_controllers_.begin())
+            ->GetLayoutManagerForContainer(
+                mash::wm::mojom::Container::USER_SHELF));
+    shelf_layout_bindings_.AddBinding(shelf_layout, std::move(request));
+  } else {
+    shelf_layout_requests_.push_back(base::WrapUnique(
+        new mojo::InterfaceRequest<mojom::ShelfLayout>(std::move(request))));
+  }
+}
+
+void WindowManagerApplication::Create(
+    mojo::Connection* connection,
+    mojo::InterfaceRequest<mojom::UserWindowController> request) {
+  if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
+    user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
+                                                std::move(request));
   } else {
     user_window_controller_requests_.push_back(base::WrapUnique(
-        new mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>(
+        new mojo::InterfaceRequest<mojom::UserWindowController>(
             std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
     mojo::Connection* connection,
     mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) {
   static int accelerator_registrar_count = 0;
   if (accelerator_registrar_count == std::numeric_limits<int>::max()) {
     // Restart from zero if we have reached the limit. It is technically
@@ skipping 11 matching lines @@
 
 void WindowManagerApplication::CreateWindowManager(
     mus::mojom::DisplayPtr display,
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
   root_controllers_.insert(RootWindowController::CreateFromDisplay(
       this, std::move(display), std::move(client_request)));
 }
 
 }  // namespace wm
 }  // namespace mash