mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/app_launcher_id.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_constants.h"
 
-class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate {
+class ChromeShelfItemDelegate : public ash::ShelfItemDelegate {

[James Cook, 2017/03/09 01:09:47]

drive-by: docs?

[msw, 2017/03/10 06:17:57]

It's unused at the moment, and the wrong pattern for going forward; removed.

  public:
   explicit ChromeShelfItemDelegate(const std::string& app_id,

[James Cook, 2017/03/09 01:09:47]

drive-by: explicit not needed

[msw, 2017/03/10 06:17:57]

Removed.

                                    ChromeLauncherController* controller)
-      : app_id_(app_id),
-        item_delegate_binding_(this),
-        controller_(controller) {}
+      : app_id_(app_id), controller_(controller) {}
   ~ChromeShelfItemDelegate() override {}
 
-  ash::mojom::ShelfItemDelegateAssociatedPtrInfo
-  CreateInterfacePtrInfoAndBind() {
-    DCHECK(!item_delegate_binding_.is_bound());
-    ash::mojom::ShelfItemDelegateAssociatedPtrInfo ptr_info;
-    item_delegate_binding_.Bind(&ptr_info);
-    return ptr_info;
-  }
-
  private:
-  // ash::mojom::ShelfItemDelegate:
-  void LaunchItem() override {
+  // ash::ShelfItemDelegate:
+  void ItemSelected(std::unique_ptr<ui::Event> event,
+                    int64_t display_id,
+                    ash::ShelfLaunchSource source,
+                    const ItemSelectedCallback& callback) override {
     controller_->LaunchApp(ash::AppLauncherId(app_id_),
                            ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
+    callback.Run(ash::SHELF_ACTION_NEW_WINDOW_CREATED, MenuItemList());

[James Cook, 2017/03/09 01:09:47]

Does this actually create a new window for all items? I'm not sure if this item
delegate is for the browser shortcut, apps or both.

[msw, 2017/03/10 06:17:57]

Unused; removed.

   }
-  void ExecuteCommand(uint32_t command_id, int event_flags) override {
+  void ExecuteCommand(uint32_t command_id, int32_t event_flags) override {
     NOTIMPLEMENTED();
   }
-  void ItemPinned() override { NOTIMPLEMENTED(); }
-  void ItemUnpinned() override { NOTIMPLEMENTED(); }
-  void ItemReordered(uint32_t order) override { NOTIMPLEMENTED(); }
+  void Close() override { NOTIMPLEMENTED(); }
 
   std::string app_id_;
-  mojo::AssociatedBinding<ash::mojom::ShelfItemDelegate> item_delegate_binding_;
 
   // Not owned.
   ChromeLauncherController* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeShelfItemDelegate);
 };
 
 ChromeLauncherControllerMus::ChromeLauncherControllerMus() {
   AttachProfile(ProfileManager::GetActiveUserProfile());
 }
@@ skipping 115 matching lines @@
 void ChromeLauncherControllerMus::ActiveUserChanged(
     const std::string& user_email) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
     Profile* profile) {
   NOTIMPLEMENTED();
 }
 
-ash::ShelfAppMenuItemList
+ash::ShelfItemDelegate::MenuItemList
 ChromeLauncherControllerMus::GetAppMenuItemsForTesting(
     const ash::ShelfItem& item) {
   NOTIMPLEMENTED();
-  return ash::ShelfAppMenuItemList();
+  return ash::ShelfItemDelegate::MenuItemList();
 }
 
 std::vector<content::WebContents*>
 ChromeLauncherControllerMus::GetV1ApplicationsFromAppId(
     const std::string& app_id) {
   NOTIMPLEMENTED();
   return std::vector<content::WebContents*>();
 }
 
 void ChromeLauncherControllerMus::ActivateShellApp(const std::string& app_id,
@@ skipping 83 matching lines @@
     if (app_launcher_id.app_id() == ash::launcher::kPinnedAppsPlaceholder)
       continue;
 
     ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());
     item->app_id = app_id;
     item->app_title = base::UTF16ToUTF8(
         launcher_controller_helper()->GetAppTitle(profile(), app_id));
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON);
     item->image = *image.ToSkBitmap();
+    // TOOD(msw): Actually pin the item and install its delegate; this code is
+    // unused at the moment. See http://crbug.com/647879
     std::unique_ptr<ChromeShelfItemDelegate> delegate(
         new ChromeShelfItemDelegate(app_id, this));
-    shelf_controller()->PinItem(std::move(item),
-                                delegate->CreateInterfacePtrInfoAndBind());
     app_id_to_item_delegate_.insert(
         std::make_pair(app_id, std::move(delegate)));
 
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app_id);
       app_icon_loader->UpdateImage(app_id);
     }
   }
 }