Add basic support for launching mash shelf pinned apps.

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 24 matching lines @@
 
 namespace {
 
 // A ShelfItemDelegate used for pinned items and open user windows.
 class ShelfItemDelegateMus : public ShelfItemDelegate {
  public:
   explicit ShelfItemDelegateMus(UserWindowController* user_window_controller)
       : user_window_controller_(user_window_controller) {}
   ~ShelfItemDelegateMus() override {}
 
+  void SetDelegate(
+      mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) {
+    delegate_.Bind(std::move(delegate));
+  }
+
   bool pinned() const { return pinned_; }
   void set_pinned(bool pinned) { pinned_ = pinned; }
 
   void AddWindow(uint32_t id, const base::string16& title) {
     DCHECK(!window_id_to_title_.count(id));
     window_id_to_title_.insert(std::make_pair(id, title));
   }
   void RemoveWindow(uint32_t id) { window_id_to_title_.erase(id); }
   void SetWindowTitle(uint32_t id, const base::string16& title) {
     DCHECK(window_id_to_title_.count(id));
@@ skipping 40 matching lines @@
 
    private:
     ShelfItemDelegateMus* item_delegate_;
 
     DISALLOW_COPY_AND_ASSIGN(ShelfMenuModelMus);
   };
 
   // ShelfItemDelegate:
   ShelfItemDelegate::PerformedAction ItemSelected(
       const ui::Event& event) override {
+    if (window_id_to_title_.empty()) {
+      delegate_->LaunchItem();
+      return kNewWindowCreated;
+    }
     if (window_id_to_title_.size() == 1) {
       user_window_controller_->FocusUserWindow(
           window_id_to_title_.begin()->first);
       return kExistingWindowActivated;
     }
     return kNoAction;
   }
 
   base::string16 GetTitle() override {
     return window_id_to_title_.empty() ? title_
@@ skipping 11 matching lines @@
 
   bool IsDraggable() override {
     NOTIMPLEMENTED();
     return false;
   }
 
   bool ShouldShowTooltip() override { return true; }
 
   void Close() override { NOTIMPLEMENTED(); }
 
+  mash::shelf::mojom::ShelfItemDelegateAssociatedPtr delegate_;
   bool pinned_ = false;
   std::map<uint32_t, base::string16> window_id_to_title_;
   base::string16 title_;
   UserWindowController* user_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
 };
 
 ShelfItemDelegateMus* GetShelfItemDelegate(ShelfID shelf_id) {
   return static_cast<ShelfItemDelegateMus*>(
@@ skipping 124 matching lines @@
                                                  Shell::GetPrimaryRootWindow());
 }
 
 void ShelfDelegateMus::PinItem(
     mash::shelf::mojom::ShelfItemPtr item,
     mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) {
   std::string app_id(item->app_id.To<std::string>());
   if (app_id_to_shelf_id_.count(app_id)) {
     ShelfID shelf_id = app_id_to_shelf_id_[app_id];
     ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
+    item_delegate->SetDelegate(std::move(delegate));
     item_delegate->set_pinned(true);
     return;
   }
 
   ShelfID shelf_id = model_->next_id();
   app_id_to_shelf_id_.insert(std::make_pair(app_id, shelf_id));
   shelf_id_to_app_id_.insert(std::make_pair(shelf_id, app_id));
 
   ShelfItem shelf_item;
   shelf_item.type = TYPE_APP_SHORTCUT;
   shelf_item.status = STATUS_CLOSED;
   shelf_item.image = GetShelfIconFromBitmap(item->image.To<SkBitmap>());
   model_->Add(shelf_item);
 
   std::unique_ptr<ShelfItemDelegateMus> item_delegate(
       new ShelfItemDelegateMus(user_window_controller_.get()));
+  item_delegate->SetDelegate(std::move(delegate));
   item_delegate->set_pinned(true);
   item_delegate->set_title(item->app_title.To<base::string16>());
   Shell::GetInstance()->shelf_item_delegate_manager()->SetShelfItemDelegate(
       shelf_id, std::move(item_delegate));
 }
 
 void ShelfDelegateMus::UnpinItem(const mojo::String& app_id) {
   if (!app_id_to_shelf_id_.count(app_id.To<std::string>()))
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id.To<std::string>()];
@@ skipping 133 matching lines @@
   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