Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / cocoa / app_list_view_controller.mm

diff --git a/src/ui/app_list/cocoa/app_list_view_controller.mm b/src/ui/app_list/cocoa/app_list_view_controller.mm
index a28171c..7bf0e3a 100644 (file)
--- a/src/ui/app_list/cocoa/app_list_view_controller.mm
+++ b/src/ui/app_list/cocoa/app_list_view_controller.mm
@@ -197,6 +197,12 @@ void AppListModelObserverBridge::OnProfilesChanged() {
           [AppsGridController scrollerPadding]);
 
   contentsView_.reset([[FlippedView alloc] initWithFrame:contentsRect]);
+
+  // The contents view contains animations both from an NSCollectionView and the
+  // app list's own transitive drag layers. Ensure the subviews have access to
+  // a compositing layer they can share.
+  [contentsView_ setWantsLayer:YES];
+
   backgroundView_.reset(
       [[BackgroundView alloc] initWithFrame:
               NSMakeRect(0, 0, NSMaxX(contentsRect), NSMaxY(contentsRect))]);
@@ -342,8 +348,10 @@ void AppListModelObserverBridge::OnProfilesChanged() {
 }
 
 - (void)openResult:(app_list::SearchResult*)result {
-  if (delegate_)
-    delegate_->OpenSearchResult(result, 0 /* event flags */);
+  if (delegate_) {
+    delegate_->OpenSearchResult(
+        result, false /* auto_launch */, 0 /* event flags */);
+  }
 }
 
 - (void)redoSearch {