mash: Support ShelfModel access in Chrome.

ash/shelf/shelf_view.cc

 // Copyright (c) 2012 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/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/ash_constants.h"
 #include "ash/drag_drop/drag_image_view.h"
+#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/scoped_root_window_for_new_windows.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/overflow_bubble.h"
 #include "ash/shelf/overflow_bubble_view.h"
 #include "ash/shelf/overflow_button.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_application_menu_model.h"
 #include "ash/shelf/shelf_button.h"
@@ skipping 435 matching lines @@
     case TYPE_UNDEFINED:
       NOTREACHED() << "ShelfItemType must be set.";
       break;
   }
 
   const int64_t display_id =
       display::Screen::GetScreen()->GetDisplayNearestWindow(window).id();
 
   // Notify the item of its selection; handle the result in AfterItemSelected.
   const ShelfItem& item = model_->items()[last_pressed_index_];
+  // Mash requires conversion of mouse and touch events to pointer events.
+  std::unique_ptr<ui::Event> passed_event = ui::Event::Clone(event);
+  if (Shell::GetAshConfig() == Config::MASH &&
+      ui::PointerEvent::CanConvertFrom(event)) {
+    if (event.IsMouseEvent())
+      passed_event = base::MakeUnique<ui::PointerEvent>(*event.AsMouseEvent());
+    else if (event.IsTouchEvent())
+      passed_event = base::MakeUnique<ui::PointerEvent>(*event.AsTouchEvent());
+    else
+      NOTREACHED() << "Need conversion of event to pointer event.";
+  }
   model_->GetShelfItemDelegate(item.id)->ItemSelected(
-      ui::Event::Clone(event), display_id, LAUNCH_FROM_UNKNOWN,
+      ui::Event::Clone(*passed_event), display_id, LAUNCH_FROM_UNKNOWN,

[James Cook, 2017/05/30 22:47:47]

Can you avoid cloning the event twice? Maybe move the Clone() inside the if()
and/or add an else?

[msw, 2017/05/31 16:55:21]

Done. This miserable client code is a sign of poor infrastructure. I pinged
Sadrul and Hadi about mus not supporting mouse/touch events, but that seems to
be their intended design for now.

       base::Bind(&ShelfView::AfterItemSelected, weak_factory_.GetWeakPtr(),
-                 item, sender, base::Passed(ui::Event::Clone(event)),
+                 item, sender, base::Passed(ui::Event::Clone(*passed_event)),
                  ink_drop));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfView, FocusTraversable implementation:
 
 views::FocusSearch* ShelfView::GetFocusSearch() {
   return focus_search_.get();
 }
 
@@ skipping 1108 matching lines @@
 void ShelfView::ShelfItemMoved(int start_index, int target_index) {
   view_model_->Move(start_index, target_index);
   // When cancelling a drag due to a shelf item being added, the currently
   // dragged item is moved back to its initial position. AnimateToIdealBounds
   // will be called again when the new item is added to the |view_model_| but
   // at this time the |view_model_| is inconsistent with the |model_|.
   if (!cancelling_drag_model_changed_)
     AnimateToIdealBounds();
 }
 
+void ShelfView::ShelfItemDelegateChanged(const ShelfID& id,
+                                         ShelfItemDelegate* delegate) {}
+
 void ShelfView::AfterItemSelected(
     const ShelfItem& item,
     views::Button* sender,
     std::unique_ptr<ui::Event> event,
     views::InkDrop* ink_drop,
     ShelfAction action,
     base::Optional<std::vector<mojom::MenuItemPtr>> menu_items) {
   shelf_button_pressed_metric_tracker_.ButtonPressed(*event, sender, action);
 
   // The app list handles its own ink drop effect state changes.
@@ skipping 213 matching lines @@
   if (pointer == TOUCH &&
       (base::TimeTicks::Now() - touch_press_time_) <
           base::TimeDelta::FromMilliseconds(kTouchDragTimeThresholdMs)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace ash