Default async to true for popup menus; fix lint errors

Fixes brave/browser-laptop#5470
brave · Feb 27, 2017 · ca5f69b · ca5f69b
1 parent 8e9f984
commit ca5f69b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/atom/browser/api/atom_api_menu_views.cc b/atom/browser/api/atom_api_menu_views.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+#include <memory>
+
 #include "atom/browser/api/atom_api_menu_views.h"
 
 #include "atom/browser/native_window_views.h"

diff --git a/atom/browser/api/atom_api_menu_views.h b/atom/browser/api/atom_api_menu_views.h
@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
 
 #include <map>
+#include <memory>
 
 #include "atom/browser/api/atom_api_menu.h"
 #include "base/memory/weak_ptr.h"

diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js
@@ -144,7 +144,7 @@ Menu.prototype._init = function () {
 }
 
 Menu.prototype.popup = function (window, x, y, positioningItem) {
-  let asyncPopup = false
+  let asyncPopup = true
 
   // menu.popup(x, y, positioningItem)
   if (typeof window !== 'object' || window.constructor !== BrowserWindow) {
@@ -161,7 +161,9 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
     x = options.x
     y = options.y
     positioningItem = options.positioningItem
-    asyncPopup = options.async
+    asyncPopup = typeof options.async === 'boolean'
+      ? options.async
+      : true
   }
 
   // Default to showing under mouse location.