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

Simplify views/menu_bar focus management (#12536)

Browse source 
* Simplify views/menu_bar focus management

* Make the linter happy

* Remove NativeWindowView focus manager listener API

* remove unnecessary change

* MenuBar ctor now takes a views::View
This commit is contained in:
Charles Kerr 2018-04-05 21:53:08 -05:00 • committed by GitHub
parent cad8eed6e4
commit f8b8dc1494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/ui/views/menu_bar.h
View file

@ -5,9 +5,6 @@
#ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
#define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
#include <memory>
#include "atom/browser/native_window.h"
#include "atom/browser/ui/atom_menu_model.h"
#include "ui/views/controls/button/menu_button_listener.h"
#include "ui/views/focus/focus_manager.h"
@ -25,7 +22,7 @@ class MenuBar : public views::View,
public views::MenuButtonListener,
public views::FocusChangeListener {
public:
explicit MenuBar(NativeWindow* window);
explicit MenuBar(views::View* window);
virtual ~MenuBar();
// Replaces current menu with a new one.
@ -50,9 +47,7 @@ class MenuBar : public views::View,
protected:
// views::View:
void AddedToWidget() override;
const char* GetClassName() const override;
void RemovedFromWidget() override;
// views::MenuButtonListener:
void OnMenuButtonClicked(views::MenuButton* source,
@ -75,12 +70,11 @@ class MenuBar : public views::View,
SkColor disabled_color_;
#endif
NativeWindow* window_;
views::View* window_;
AtomMenuModel* menu_model_;
View* FindAccelChild(base::char16 key);
std::shared_ptr<views::FocusManager> focus_manager_;
bool has_focus_ = true;
DISALLOW_COPY_AND_ASSIGN(MenuBar);