From a8d1a7aed485485b355bf9bcb8b119f838953694 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 17 Feb 2017 12:16:29 -0800 Subject: [PATCH] Make variables private instead of protected --- atom/browser/api/atom_api_menu_mac.h | 8 +++++--- atom/browser/api/atom_api_menu_views.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/atom/browser/api/atom_api_menu_mac.h b/atom/browser/api/atom_api_menu_mac.h index 7c41cd7..bc70e5b 100644 --- a/atom/browser/api/atom_api_menu_mac.h +++ b/atom/browser/api/atom_api_menu_mac.h @@ -29,14 +29,16 @@ class MenuMac : public Menu { bool async); void ClosePopupAt(int32_t window_id) override; - scoped_nsobject menu_controller_; - std::map> popup_controllers_; - private: friend class Menu; static void SendActionToFirstResponder(const std::string& action); + scoped_nsobject menu_controller_; + + // window ID -> open context menu + std::map> popup_controllers_; + base::WeakPtrFactory weak_factory_; DISALLOW_COPY_AND_ASSIGN(MenuMac); diff --git a/atom/browser/api/atom_api_menu_views.h b/atom/browser/api/atom_api_menu_views.h index f59e9d5..a974f75 100644 --- a/atom/browser/api/atom_api_menu_views.h +++ b/atom/browser/api/atom_api_menu_views.h @@ -26,7 +26,9 @@ class MenuViews : public Menu { void ClosePopupAt(int32_t window_id) override; private: + // window ID -> open context menu std::map> menu_runners_; + base::WeakPtrFactory weak_factory_; DISALLOW_COPY_AND_ASSIGN(MenuViews); -- 2.7.4