Revert "Rough in support for multiple selection in holding space."

This reverts commit 5aa92900.

Reason for revert: Suspicious of introducing a heap use after free.

Original change's description:
> Rough in support for multiple selection in holding space.
> 
> Holding space needs to support selection of multiple holding space items
> to perform bulk context menu and drag/drop operations on them at a time.
> 
> This CL refactors HoldingSpaceItemContextMenu into a shared
> HoldingSpaceItemViewDelegate to facilitate these requirements.
> 
> Note that this CL does not change any existing behavior, just lays the
> groundwork for supporting multiple selection.
> 
> Bug: 1129981
> Change-Id: If4da6c19ba01bd7104a1b1487350c362d7be1dd4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419136
> Commit-Queue: David Black <dmblack@google.com>
> Reviewed-by: Ahmed Mehfooz <amehfooz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#809625}

TBR=dmblack@google.com,amehfooz@chromium.org

Change-Id: I6c0ea6374b87d7d2f673f80e97781b1036604a14
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1129981,1131382
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2425048Reviewed-by: Tim Schumann <tschumann@chromium.org>
Commit-Queue: Tim Schumann <tschumann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809721}

ash/BUILD.gn

@@ -926,12 +926,12 @@ component("ash") {
     "system/holding_space/holding_space_item_chip_view.h",
     "system/holding_space/holding_space_item_chips_container.cc",
     "system/holding_space/holding_space_item_chips_container.h",
+    "system/holding_space/holding_space_item_context_menu.cc",
+    "system/holding_space/holding_space_item_context_menu.h",
     "system/holding_space/holding_space_item_screenshot_view.cc",
     "system/holding_space/holding_space_item_screenshot_view.h",
     "system/holding_space/holding_space_item_view.cc",
     "system/holding_space/holding_space_item_view.h",
-    "system/holding_space/holding_space_item_view_delegate.cc",
-    "system/holding_space/holding_space_item_view_delegate.h",
     "system/holding_space/holding_space_item_views_container.cc",
     "system/holding_space/holding_space_item_views_container.h",
     "system/holding_space/holding_space_tray.cc",

ash/system/holding_space/holding_space_item_chip_view.cc

@@ -30,10 +30,8 @@
 
 namespace ash {
 
-HoldingSpaceItemChipView::HoldingSpaceItemChipView(
-    HoldingSpaceItemViewDelegate* delegate,
-    const HoldingSpaceItem* item)
-    : HoldingSpaceItemView(delegate, item) {
+HoldingSpaceItemChipView::HoldingSpaceItemChipView(const HoldingSpaceItem* item)
+    : HoldingSpaceItemView(item) {
   auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kHorizontal,
       gfx::Insets(kHoldingSpaceChipPadding), kHoldingSpaceChipChildSpacing));

ash/system/holding_space/holding_space_item_chip_view.h

@@ -21,7 +21,6 @@ class ToggleImageButton;
 namespace ash {
 
 class HoldingSpaceItem;
-class HoldingSpaceItemViewDelegate;
 
 namespace tray {
 class RoundedImageView;
@@ -34,8 +33,7 @@ class ASH_EXPORT HoldingSpaceItemChipView : public HoldingSpaceItemView,
  public:
   METADATA_HEADER(HoldingSpaceItemChipView);
 
-  HoldingSpaceItemChipView(HoldingSpaceItemViewDelegate* delegate,
-                           const HoldingSpaceItem* item);
+  explicit HoldingSpaceItemChipView(const HoldingSpaceItem* item);
   HoldingSpaceItemChipView(const HoldingSpaceItemChipView&) = delete;
   HoldingSpaceItemChipView& operator=(const HoldingSpaceItemChipView&) = delete;
   ~HoldingSpaceItemChipView() override;

ash/system/holding_space/holding_space_item_chips_container.cc

@@ -5,6 +5,9 @@
 #include "ash/system/holding_space/holding_space_item_chips_container.h"
 
 #include "ash/public/cpp/holding_space/holding_space_constants.h"
+#include "ash/public/cpp/holding_space/holding_space_item.h"
+#include "ash/system/holding_space/holding_space_item_chip_view.h"
+#include "base/debug/stack_trace.h"
 #include "ui/views/layout/layout_manager_base.h"
 #include "ui/views/layout/proposed_layout.h"
 

ash/system/holding_space/holding_space_item_chips_container.h

@@ -10,7 +10,8 @@
 
 namespace ash {
 
-// A container view which arranges item chips into a 2 column grid.
+// A container view which automatically arranges item chips into a 2 column
+// grid.
 class HoldingSpaceItemChipsContainer : public views::View {
  public:
   HoldingSpaceItemChipsContainer();

ash/system/holding_space/holding_space_item_view_delegate.cc → ash/system/holding_space/holding_space_item_context_menu.cc

@@ -2,19 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/holding_space/holding_space_item_view_delegate.h"
+#include "ash/system/holding_space/holding_space_item_context_menu.h"
 
 #include "ash/public/cpp/holding_space/holding_space_client.h"
 #include "ash/public/cpp/holding_space/holding_space_constants.h"
 #include "ash/public/cpp/holding_space/holding_space_controller.h"
-#include "ash/public/cpp/holding_space/holding_space_item.h"
 #include "ash/public/cpp/holding_space/holding_space_model.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/holding_space/holding_space_item_view.h"
 #include "base/bind.h"
 #include "net/base/mime_util.h"
-#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ -23,79 +21,16 @@
 
 namespace ash {
 
-namespace {
+HoldingSpaceItemContextMenu::HoldingSpaceItemContextMenu(
+    const HoldingSpaceItem* item)
+    : item_(item) {}
 
-// It is expected that all `HoldingSpaceItemView`s share the same delegate in
-// order to support multiple selections. We cache the singleton `instance` in
-// order to enforce this requirement.
-HoldingSpaceItemViewDelegate* instance = nullptr;
+HoldingSpaceItemContextMenu::~HoldingSpaceItemContextMenu() = default;
 
-// Helpers ---------------------------------------------------------------------
-
-// Attempts to open the specified holding space `item`.
-void OpenItem(const HoldingSpaceItem& item) {
-  HoldingSpaceController::Get()->client()->OpenItem(item, base::DoNothing());
-}
-
-}  // namespace
-
-// HoldingSpaceItemViewDelegate ------------------------------------------------
-
-HoldingSpaceItemViewDelegate::HoldingSpaceItemViewDelegate() {
-  DCHECK_EQ(nullptr, instance);
-  instance = this;
-}
-
-HoldingSpaceItemViewDelegate::~HoldingSpaceItemViewDelegate() {
-  DCHECK_EQ(instance, this);
-  instance = nullptr;
-}
-
-// TODO(dmblack): Implement multiple selection.
-void HoldingSpaceItemViewDelegate::OnHoldingSpaceItemViewGestureEvent(
-    HoldingSpaceItemView* view,
-    const ui::GestureEvent& event) {
-  if (event.type() == ui::ET_GESTURE_TAP)
-    OpenItem(*view->item());
-}
-
-// TODO(dmblack): Handle multiple selection.
-bool HoldingSpaceItemViewDelegate::OnHoldingSpaceItemViewKeyPressed(
-    HoldingSpaceItemView* view,
-    const ui::KeyEvent& event) {
-  if (event.key_code() == ui::KeyboardCode::VKEY_RETURN) {
-    OpenItem(*view->item());
-    return true;
-  }
-  return false;
-}
-
-// TODO(dmblack): Handle multiple selection.
-bool HoldingSpaceItemViewDelegate::OnHoldingSpaceItemViewMousePressed(
-    HoldingSpaceItemView* view,
-    const ui::MouseEvent& event) {
-  if (event.flags() & ui::EF_IS_DOUBLE_CLICK) {
-    OpenItem(*view->item());
-    return true;
-  }
-  return false;
-}
-
-void HoldingSpaceItemViewDelegate::OnHoldingSpaceItemViewDestroyed(
-    HoldingSpaceItemView* view) {
-  selected_views_by_item_id_.erase(view->item()->id());
-}
-
-// TODO(dmblack): Handle multiple selection.
-void HoldingSpaceItemViewDelegate::ShowContextMenuForViewImpl(
+void HoldingSpaceItemContextMenu::ShowContextMenuForViewImpl(
     views::View* source,
     const gfx::Point& point,
     ui::MenuSourceType source_type) {
-  selected_views_by_item_id_.clear();
-
-  HoldingSpaceItemView* selected_view = HoldingSpaceItemView::Cast(source);
-  selected_views_by_item_id_[selected_view->item()->id()] = selected_view;
-
   int run_types = views::MenuRunner::USE_TOUCHABLE_LAYOUT |
                   views::MenuRunner::CONTEXT_MENU |
                   views::MenuRunner::FIXED_ANCHOR;
@@ -109,65 +44,27 @@ void HoldingSpaceItemViewDelegate::ShowContextMenuForViewImpl(
       source_type);
 }
 
-// TODO(dmblack): Handle multiple selection.
-bool HoldingSpaceItemViewDelegate::CanStartDragForView(
-    views::View* sender,
-    const gfx::Point& press_pt,
-    const gfx::Point& current_pt) {
-  selected_views_by_item_id_.clear();
-
-  HoldingSpaceItemView* selected_view = HoldingSpaceItemView::Cast(sender);
-  selected_views_by_item_id_[selected_view->item()->id()] = selected_view;
-
-  return true;
-}
-
-int HoldingSpaceItemViewDelegate::GetDragOperationsForView(
-    views::View* sender,
-    const gfx::Point& press_pt) {
-  return ui::DragDropTypes::DRAG_COPY;
-}
-
-// TODO(dmblack): Handle multiple selection.
-void HoldingSpaceItemViewDelegate::WriteDragDataForView(
-    views::View* sender,
-    const gfx::Point& press_pt,
-    ui::OSExchangeData* data) {
-  DCHECK_EQ(1u, selected_views_by_item_id_.size());
-  auto* selected_view = selected_views_by_item_id_.begin()->second;
-  data->SetFilename(selected_view->item()->file_path());
-}
-
-// TODO(dmblack): Handle multiple selection.
-void HoldingSpaceItemViewDelegate::ExecuteCommand(int command_id,
-                                                  int event_flags) {
-  DCHECK_EQ(1u, selected_views_by_item_id_.size());
-  auto* selected_view = selected_views_by_item_id_.begin()->second;
-
+void HoldingSpaceItemContextMenu::ExecuteCommand(int command_id,
+                                                 int event_flags) {
   switch (command_id) {
     case HoldingSpaceCommandId::kCopyImageToClipboard:
       HoldingSpaceController::Get()->client()->CopyImageToClipboard(
-          *selected_view->item(), base::DoNothing());
+          *item_, base::DoNothing());
       break;
     case HoldingSpaceCommandId::kPinItem:
-      HoldingSpaceController::Get()->client()->PinItem(*selected_view->item());
+      HoldingSpaceController::Get()->client()->PinItem(*item_);
       break;
     case HoldingSpaceCommandId::kShowInFolder:
       HoldingSpaceController::Get()->client()->ShowItemInFolder(
-          *selected_view->item(), base::DoNothing());
+          *item_, base::DoNothing());
       break;
     case HoldingSpaceCommandId::kUnpinItem:
-      HoldingSpaceController::Get()->client()->UnpinItem(
-          *selected_view->item());
+      HoldingSpaceController::Get()->client()->UnpinItem(*item_);
       break;
   }
 }
 
-// TODO(dmblack): Handle multiple selection.
-ui::SimpleMenuModel* HoldingSpaceItemViewDelegate::BuildMenuModel() {
-  DCHECK_EQ(1u, selected_views_by_item_id_.size());
-  auto* selected_view = selected_views_by_item_id_.begin()->second;
-
+ui::SimpleMenuModel* HoldingSpaceItemContextMenu::BuildMenuModel() {
   context_menu_model_ = std::make_unique<ui::SimpleMenuModel>(this);
   context_menu_model_->AddItemWithIcon(
       HoldingSpaceCommandId::kShowInFolder,
@@ -176,9 +73,9 @@ ui::SimpleMenuModel* HoldingSpaceItemViewDelegate::BuildMenuModel() {
       ui::ImageModel::FromVectorIcon(kFolderIcon));
 
   std::string mime_type;
-  const bool is_image = net::GetMimeTypeFromFile(
-                            selected_view->item()->file_path(), &mime_type) &&
-                        net::MatchesMimeType(kMimeTypeImage, mime_type);
+  const bool is_image =
+      net::GetMimeTypeFromFile(item_->file_path(), &mime_type) &&
+      net::MatchesMimeType(kMimeTypeImage, mime_type);
 
   if (is_image) {
     context_menu_model_->AddItemWithIcon(
@@ -189,10 +86,8 @@ ui::SimpleMenuModel* HoldingSpaceItemViewDelegate::BuildMenuModel() {
   }
 
   const bool is_pinned = HoldingSpaceController::Get()->model()->GetItem(
-      HoldingSpaceItem::GetFileBackedItemId(
-          HoldingSpaceItem::Type::kPinnedFile,
-          selected_view->item()->file_path()));
-
+      HoldingSpaceItem::GetFileBackedItemId(HoldingSpaceItem::Type::kPinnedFile,
+                                            item_->file_path()));
   if (!is_pinned) {
     context_menu_model_->AddItemWithIcon(
         HoldingSpaceCommandId::kPinItem,

ash/system/holding_space/holding_space_item_context_menu.h

+// Copyright 2020 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.
+
+#ifndef ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_CONTEXT_MENU_H_
+#define ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_CONTEXT_MENU_H_
+
+#include <memory>
+
+#include "ash/ash_export.h"
+#include "ash/public/cpp/holding_space/holding_space_item.h"
+#include "ui/base/models/simple_menu_model.h"
+#include "ui/views/context_menu_controller.h"
+
+namespace views {
+class MenuRunner;
+}  // namespace views
+
+namespace ash {
+
+// This class handles creation of the context menu view and handling
+// commands available in the menu.
+class ASH_EXPORT HoldingSpaceItemContextMenu
+    : public views::ContextMenuController,
+      public ui::SimpleMenuModel::Delegate {
+ public:
+  explicit HoldingSpaceItemContextMenu(const HoldingSpaceItem* item);
+  HoldingSpaceItemContextMenu(const HoldingSpaceItemContextMenu&) = delete;
+  HoldingSpaceItemContextMenu& operator=(const HoldingSpaceItemContextMenu&) =
+      delete;
+  ~HoldingSpaceItemContextMenu() override;
+
+  // views::ContextMenuController:
+  void ShowContextMenuForViewImpl(views::View* source,
+                                  const gfx::Point& point,
+                                  ui::MenuSourceType source_type) override;
+
+  // SimpleMenuModel::Delegate:
+  void ExecuteCommand(int command_id, int event_flags) override;
+
+ private:
+  ui::SimpleMenuModel* BuildMenuModel();
+
+  std::unique_ptr<ui::SimpleMenuModel> context_menu_model_;
+  std::unique_ptr<views::MenuRunner> context_menu_runner_;
+
+  // The holding space item that this context menu's actions will effect.
+  const HoldingSpaceItem* const item_;
+};
+
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_CONTEXT_MENU_H_

ash/system/holding_space/holding_space_item_screenshot_view.cc

@@ -16,9 +16,8 @@
 namespace ash {
 
 HoldingSpaceItemScreenshotView::HoldingSpaceItemScreenshotView(
-    HoldingSpaceItemViewDelegate* delegate,
     const HoldingSpaceItem* item)
-    : HoldingSpaceItemView(delegate, item) {
+    : HoldingSpaceItemView(item) {
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
   image_ = AddChildView(

ash/system/holding_space/holding_space_item_screenshot_view.h

@@ -13,7 +13,6 @@
 namespace ash {
 
 class HoldingSpaceItem;
-class HoldingSpaceItemViewDelegate;
 
 namespace tray {
 class RoundedImageView;
@@ -23,8 +22,7 @@ class ASH_EXPORT HoldingSpaceItemScreenshotView : public HoldingSpaceItemView {
  public:
   METADATA_HEADER(HoldingSpaceItemScreenshotView);
 
-  HoldingSpaceItemScreenshotView(HoldingSpaceItemViewDelegate* delegate,
-                                 const HoldingSpaceItem* item);
+  explicit HoldingSpaceItemScreenshotView(const HoldingSpaceItem* item);
   HoldingSpaceItemScreenshotView(const HoldingSpaceItemScreenshotView&) =
       delete;
   HoldingSpaceItemScreenshotView& operator=(

ash/system/holding_space/holding_space_item_view.cc

@@ -4,36 +4,41 @@
 
 #include "ash/system/holding_space/holding_space_item_view.h"
 
+#include "ash/public/cpp/holding_space/holding_space_client.h"
 #include "ash/public/cpp/holding_space/holding_space_constants.h"
+#include "ash/public/cpp/holding_space/holding_space_controller.h"
 #include "ash/public/cpp/holding_space/holding_space_item.h"
 #include "ash/public/cpp/shelf_config.h"
-#include "ash/system/holding_space/holding_space_item_view_delegate.h"
-#include "ui/base/class_property.h"
+#include "ash/strings/grit/ash_strings.h"
+#include "ash/system/holding_space/holding_space_item_context_menu.h"
+#include "base/bind_helpers.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/text_constants.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/focus_ring.h"
 #include "ui/views/controls/highlight_path_generator.h"
+#include "ui/views/controls/menu/menu_runner.h"
 
 namespace ash {
 
 namespace {
 
-// A UI class property used to identify if a view is an instance of
-// `HoldingSpaceItemView`. Class name is not an adequate identifier as it may be
-// overridden by subclasses.
-DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIsHoldingSpaceItemViewProperty, false)
+// Helpers ---------------------------------------------------------------------
+
+// Attempts to open the specified holding space `item`.
+void OpenItem(const HoldingSpaceItem& item) {
+  HoldingSpaceController::Get()->client()->OpenItem(item, base::DoNothing());
+}
 
 }  // namespace
 
 // HoldingSpaceItemView --------------------------------------------------------
 
-HoldingSpaceItemView::HoldingSpaceItemView(
-    HoldingSpaceItemViewDelegate* delegate,
-    const HoldingSpaceItem* item)
-    : delegate_(delegate), item_(item) {
-  SetProperty(kIsHoldingSpaceItemViewProperty, true);
-
-  set_context_menu_controller(delegate_);
-  set_drag_controller(delegate_);
+HoldingSpaceItemView::HoldingSpaceItemView(const HoldingSpaceItem* item)
+    : item_(item),
+      context_menu_(std::make_unique<HoldingSpaceItemContextMenu>(item_)) {
+  set_context_menu_controller(context_menu_.get());
 
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
@@ -49,14 +54,10 @@ HoldingSpaceItemView::HoldingSpaceItemView(
                                                 kHoldingSpaceCornerRadius);
 }
 
-HoldingSpaceItemView::~HoldingSpaceItemView() {
-  delegate_->OnHoldingSpaceItemViewDestroyed(this);
-}
+HoldingSpaceItemView::~HoldingSpaceItemView() = default;
 
-// static
-HoldingSpaceItemView* HoldingSpaceItemView::Cast(views::View* view) {
-  DCHECK(view->GetProperty(kIsHoldingSpaceItemViewProperty));
-  return static_cast<HoldingSpaceItemView*>(view);
+int HoldingSpaceItemView::GetDragOperations(const gfx::Point& point) {
+  return ui::DragDropTypes::DRAG_COPY;
 }
 
 SkColor HoldingSpaceItemView::GetInkDropBaseColor() const {
@@ -64,15 +65,29 @@ SkColor HoldingSpaceItemView::GetInkDropBaseColor() const {
 }
 
 void HoldingSpaceItemView::OnGestureEvent(ui::GestureEvent* event) {
-  delegate_->OnHoldingSpaceItemViewGestureEvent(this, *event);
+  if (event->type() == ui::ET_GESTURE_TAP)
+    OpenItem(*item());
 }
 
 bool HoldingSpaceItemView::OnKeyPressed(const ui::KeyEvent& event) {
-  return delegate_->OnHoldingSpaceItemViewKeyPressed(this, event);
+  if (event.key_code() == ui::KeyboardCode::VKEY_RETURN) {
+    OpenItem(*item());
+    return true;
+  }
+  return false;
 }
 
 bool HoldingSpaceItemView::OnMousePressed(const ui::MouseEvent& event) {
-  return delegate_->OnHoldingSpaceItemViewMousePressed(this, event);
+  if (event.flags() & ui::EF_IS_DOUBLE_CLICK) {
+    OpenItem(*item());
+    return true;
+  }
+  return false;
+}
+
+void HoldingSpaceItemView::WriteDragData(const gfx::Point& point,
+                                         ui::OSExchangeData* data) {
+  data->SetFilename(item_->file_path());
 }
 
 }  // namespace ash

ash/system/holding_space/holding_space_item_view.h

@@ -5,37 +5,38 @@
 #ifndef ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_VIEW_H_
 #define ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_VIEW_H_
 
+#include <memory>
+
 #include "ash/ash_export.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/views/animation/ink_drop_host_view.h"
 
 namespace ash {
 
 class HoldingSpaceItem;
-class HoldingSpaceItemViewDelegate;
+class HoldingSpaceItemContextMenu;
 
 // Base class for HoldingSpaceItemChipView and HoldingSpaceItemScreenshotView.
 class ASH_EXPORT HoldingSpaceItemView : public views::InkDropHostView {
  public:
-  HoldingSpaceItemView(HoldingSpaceItemViewDelegate*, const HoldingSpaceItem*);
+  explicit HoldingSpaceItemView(const HoldingSpaceItem* item);
   HoldingSpaceItemView(const HoldingSpaceItemView&) = delete;
   HoldingSpaceItemView& operator=(const HoldingSpaceItemView&) = delete;
   ~HoldingSpaceItemView() override;
 
-  // Returns `view` cast as a `HoldingSpaceItemView`. Note that this performs a
-  // DCHECK to assert that `view` is in fact a `HoldingSpaceItemView` instance.
-  static HoldingSpaceItemView* Cast(views::View* view);
-
   // views::InkDropHostView:
+  int GetDragOperations(const gfx::Point& point) override;
   SkColor GetInkDropBaseColor() const override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
+  void WriteDragData(const gfx::Point& point, ui::OSExchangeData*) override;
 
   const HoldingSpaceItem* item() const { return item_; }
 
  private:
-  HoldingSpaceItemViewDelegate* delegate_;
   const HoldingSpaceItem* const item_;
+  std::unique_ptr<HoldingSpaceItemContextMenu> const context_menu_;
 };
 
 }  // namespace ash

ash/system/holding_space/holding_space_item_view_delegate.h

-// Copyright 2020 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.
-
-#ifndef ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_VIEW_DELEGATE_H_
-#define ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_VIEW_DELEGATE_H_
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "ash/ash_export.h"
-#include "ui/base/models/simple_menu_model.h"
-#include "ui/views/context_menu_controller.h"
-#include "ui/views/drag_controller.h"
-
-namespace ui {
-class GestureEvent;
-class KeyEvent;
-class MouseEvent;
-}  // namespace ui
-
-namespace views {
-class MenuRunner;
-}  // namespace views
-
-namespace ash {
-
-class HoldingSpaceItemView;
-
-// TODO(dmblack): Implement multiple selection.
-// A delegate for `HoldingSpaceItemView`s which implements context menu,
-// drag-and-drop, and selection functionality. In order to support multiple
-// selections at a time, all `HoldingSpaceItemView`s must share the same
-// `HoldingSpaceItemViewDelegate` instance.
-class ASH_EXPORT HoldingSpaceItemViewDelegate
-    : public views::ContextMenuController,
-      public views::DragController,
-      public ui::SimpleMenuModel::Delegate {
- public:
-  HoldingSpaceItemViewDelegate();
-  HoldingSpaceItemViewDelegate(const HoldingSpaceItemViewDelegate&) = delete;
-  HoldingSpaceItemViewDelegate& operator=(const HoldingSpaceItemViewDelegate&) =
-      delete;
-  ~HoldingSpaceItemViewDelegate() override;
-
-  // Invoked when `view` receives the specified gesture `event`.
-  void OnHoldingSpaceItemViewGestureEvent(HoldingSpaceItemView* view,
-                                          const ui::GestureEvent& event);
-
-  // Invoked when `view` receives the specified key pressed `event`.
-  bool OnHoldingSpaceItemViewKeyPressed(HoldingSpaceItemView* view,
-                                        const ui::KeyEvent& event);
-
-  // Invoked when `view` receives the specified mouse pressed `event`.
-  bool OnHoldingSpaceItemViewMousePressed(HoldingSpaceItemView* view,
-                                          const ui::MouseEvent& event);
-
-  // Invoked when `view` has been destroyed.
-  void OnHoldingSpaceItemViewDestroyed(HoldingSpaceItemView* view);
-
- private:
-  // views::ContextMenuController:
-  void ShowContextMenuForViewImpl(views::View* source,
-                                  const gfx::Point& point,
-                                  ui::MenuSourceType source_type) override;
-
-  // views::DragController:
-  bool CanStartDragForView(views::View* sender,
-                           const gfx::Point& press_pt,
-                           const gfx::Point& current_pt) override;
-  int GetDragOperationsForView(views::View* sender,
-                               const gfx::Point& press_pt) override;
-  void WriteDragDataForView(views::View* sender,
-                            const gfx::Point& press_pt,
-                            ui::OSExchangeData* data) override;
-
-  // SimpleMenuModel::Delegate:
-  void ExecuteCommand(int command_id, int event_flags) override;
-
-  // Builds and returns a raw pointer to `context_menu_model_`.
-  ui::SimpleMenuModel* BuildMenuModel();
-
-  std::unique_ptr<ui::SimpleMenuModel> context_menu_model_;
-  std::unique_ptr<views::MenuRunner> context_menu_runner_;
-
-  std::map<std::string, HoldingSpaceItemView*> selected_views_by_item_id_;
-};
-
-}  // namespace ash
-
-#endif  // ASH_SYSTEM_HOLDING_SPACE_HOLDING_SPACE_ITEM_VIEW_DELEGATE_H_

ash/system/holding_space/holding_space_tray.cc

@@ -149,8 +149,8 @@ void HoldingSpaceTray::ShowBubble(bool show_by_click) {
   bubble_view->set_margins(GetSecondaryBubbleInsets());
 
   // Add pinned files container.
-  pinned_files_container_ = bubble_view->AddChildView(
-      std::make_unique<PinnedFilesContainer>(&delegate_));
+  pinned_files_container_ =
+      bubble_view->AddChildView(std::make_unique<PinnedFilesContainer>());
   SetupChildLayer(pinned_files_container_);
 
   // Separator between the two containers, gives illusion of 2 separate bubbles.
@@ -159,8 +159,8 @@ void HoldingSpaceTray::ShowBubble(bool show_by_click) {
   separator->SetBorder(views::CreateEmptyBorder(
       gfx::Insets(kHoldingSpaceContainerSpacing, 0, 0, 0)));
 
-  recent_files_container_ = bubble_view->AddChildView(
-      std::make_unique<RecentFilesContainer>(&delegate_));
+  recent_files_container_ =
+      bubble_view->AddChildView(std::make_unique<RecentFilesContainer>());
   SetupChildLayer(recent_files_container_);
 
   // Show the bubble.

ash/system/holding_space/holding_space_tray.h

@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/system/holding_space/holding_space_item_view_delegate.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "base/memory/weak_ptr.h"
 
@@ -61,10 +60,6 @@ class ASH_EXPORT HoldingSpaceTray : public TrayBackgroundView {
 
   std::unique_ptr<TrayBubbleWrapper> bubble_;
 
-  // The singleton delegate for `HoldingSpaceItemView`s that implements support
-  // for context menu, drag-and-drop, and multiple selection.
-  HoldingSpaceItemViewDelegate delegate_;
-
   PinnedFilesContainer* pinned_files_container_ = nullptr;
   RecentFilesContainer* recent_files_container_ = nullptr;
 

ash/system/holding_space/pinned_files_container.cc

@@ -22,9 +22,7 @@
 
 namespace ash {
 
-PinnedFilesContainer::PinnedFilesContainer(
-    HoldingSpaceItemViewDelegate* delegate)
-    : delegate_(delegate) {
+PinnedFilesContainer::PinnedFilesContainer() {
   SetID(kHoldingSpacePinnedFilesContainerId);
 
   SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -54,8 +52,7 @@ void PinnedFilesContainer::AddHoldingSpaceItemView(
 
   if (item->type() == HoldingSpaceItem::Type::kPinnedFile) {
     views_by_item_id_[item->id()] = item_chips_container_->AddChildViewAt(
-        std::make_unique<HoldingSpaceItemChipView>(delegate_, item),
-        /*index=*/0);
+        std::make_unique<HoldingSpaceItemChipView>(item), 0 /*index*/);
   }
 }
 

ash/system/holding_space/pinned_files_container.h

@@ -12,12 +12,11 @@
 namespace ash {
 
 class HoldingSpaceItemChipsContainer;
-class HoldingSpaceItemViewDelegate;
 
 // Container for pinned files that the user adds to the holding space bubble.
 class PinnedFilesContainer : public HoldingSpaceItemViewsContainer {
  public:
-  explicit PinnedFilesContainer(HoldingSpaceItemViewDelegate* delegate);
+  PinnedFilesContainer();
   PinnedFilesContainer(const PinnedFilesContainer& other) = delete;
   PinnedFilesContainer& operator=(const PinnedFilesContainer& other) = delete;
   ~PinnedFilesContainer() override;
@@ -28,7 +27,6 @@ class PinnedFilesContainer : public HoldingSpaceItemViewsContainer {
   void RemoveHoldingSpaceItemView(const HoldingSpaceItem* item) override;
 
  private:
-  HoldingSpaceItemViewDelegate* const delegate_;
   HoldingSpaceItemChipsContainer* item_chips_container_ = nullptr;
 
   std::map<std::string, views::View*> views_by_item_id_;

ash/system/holding_space/recent_files_container.cc

@@ -22,9 +22,7 @@
 
 namespace ash {
 
-RecentFilesContainer::RecentFilesContainer(
-    HoldingSpaceItemViewDelegate* delegate)
-    : delegate_(delegate) {
+RecentFilesContainer::RecentFilesContainer() {
   SetID(kHoldingSpaceRecentFilesContainerId);
 
   SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -68,12 +66,10 @@ void RecentFilesContainer::AddHoldingSpaceItemView(
   DCHECK(!base::Contains(views_by_item_id_, item->id()));
   if (item->type() == HoldingSpaceItem::Type::kScreenshot) {
     views_by_item_id_[item->id()] = screenshots_container_->AddChildViewAt(
-        std::make_unique<HoldingSpaceItemScreenshotView>(delegate_, item),
-        /*index=*/0);
+        std::make_unique<HoldingSpaceItemScreenshotView>(item), 0 /*index*/);
   } else if (item->type() == HoldingSpaceItem::Type::kDownload) {
     views_by_item_id_[item->id()] = recent_downloads_container_->AddChildViewAt(
-        std::make_unique<HoldingSpaceItemChipView>(delegate_, item),
-        /*index=*/0);
+        std::make_unique<HoldingSpaceItemChipView>(item), 0 /*index*/);
   }
 }
 
@@ -88,13 +84,13 @@ void RecentFilesContainer::RemoveHoldingSpaceItemView(
   auto it = views_by_item_id_.find(item->id());
   if (it == views_by_item_id_.end())
     return;
+  views::View* view = it->second;
 
   if (item->type() == HoldingSpaceItem::Type::kScreenshot) {
-    screenshots_container_->RemoveChildViewT(it->second);
+    screenshots_container_->RemoveChildViewT(view);
   } else if (item->type() == HoldingSpaceItem::Type::kDownload) {
-    recent_downloads_container_->RemoveChildViewT(it->second);
+    recent_downloads_container_->RemoveChildViewT(view);
   }
-
   views_by_item_id_.erase(it);
 }
 

ash/system/holding_space/recent_files_container.h

@@ -12,12 +12,11 @@
 namespace ash {
 
 class HoldingSpaceItemChipsContainer;
-class HoldingSpaceItemViewDelegate;
 
 // Container for the recent files (Screenshots, downloads etc).
 class RecentFilesContainer : public HoldingSpaceItemViewsContainer {
  public:
-  explicit RecentFilesContainer(HoldingSpaceItemViewDelegate* delegate);
+  RecentFilesContainer();
   RecentFilesContainer(const RecentFilesContainer& other) = delete;
   RecentFilesContainer& operator=(const RecentFilesContainer& other) = delete;
   ~RecentFilesContainer() override;
@@ -28,7 +27,6 @@ class RecentFilesContainer : public HoldingSpaceItemViewsContainer {
   void RemoveHoldingSpaceItemView(const HoldingSpaceItem* item) override;
 
  private:
-  HoldingSpaceItemViewDelegate* const delegate_;
   views::View* screenshots_container_ = nullptr;
   HoldingSpaceItemChipsContainer* recent_downloads_container_ = nullptr;