mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Make variables private instead of protected

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-17 12:16:29 -08:00
parent 2006e22aa4
commit a8d1a7aed4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_menu_mac.h
View file

@ -29,14 +29,16 @@ class MenuMac : public Menu {
bool async); bool async);
void ClosePopupAt(int32_t window_id) override; void ClosePopupAt(int32_t window_id) override;
scoped_nsobject<AtomMenuController> menu_controller_;
std::map<int32_t, scoped_nsobject<AtomMenuController>> popup_controllers_;
private: private:
friend class Menu; friend class Menu;
static void SendActionToFirstResponder(const std::string& action); static void SendActionToFirstResponder(const std::string& action);
scoped_nsobject<AtomMenuController> menu_controller_;
// window ID -> open context menu
std::map<int32_t, scoped_nsobject<AtomMenuController>> popup_controllers_;
base::WeakPtrFactory<MenuMac> weak_factory_; base::WeakPtrFactory<MenuMac> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(MenuMac); DISALLOW_COPY_AND_ASSIGN(MenuMac);

2
atom/browser/api/atom_api_menu_views.h
View file

@ -26,7 +26,9 @@ class MenuViews : public Menu {
void ClosePopupAt(int32_t window_id) override; void ClosePopupAt(int32_t window_id) override;
private: private:
// window ID -> open context menu
std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_; std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_;
base::WeakPtrFactory<MenuViews> weak_factory_; base::WeakPtrFactory<MenuViews> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(MenuViews); DISALLOW_COPY_AND_ASSIGN(MenuViews);