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

Manage AtomTouchBar in NativeWindow instead of AtomNSWindow

Browse source
This commit is contained in:
Cheng Zhao 2018-04-19 16:12:11 +09:00
parent ce54fd334d
commit 8e9667d86c
2 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_window_mac.h
View file

@ -17,6 +17,7 @@
@class AtomNSWindow;
@class AtomNSWindowDelegate;
@class AtomTouchBar;
@class FullSizeContentView;
namespace atom {
@ -136,6 +137,7 @@ class NativeWindowMac : public NativeWindow {
};
TitleBarStyle title_bar_style() const { return title_bar_style_; }
AtomTouchBar* atom_touch_bar() const { return atom_touch_bar_.get(); }
bool zoom_to_page_width() const { return zoom_to_page_width_; }
bool fullscreen_window_title() const { return fullscreen_window_title_; }
bool simple_fullscreen() const { return always_simple_fullscreen_; }
@ -148,6 +150,7 @@ class NativeWindowMac : public NativeWindow {
base::scoped_nsobject<AtomNSWindow> window_;
base::scoped_nsobject<AtomNSWindowDelegate> window_delegate_;
base::scoped_nsobject<AtomTouchBar> atom_touch_bar_;
std::unique_ptr<views::Widget> widget_;