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

Add NativeWindow::SetContentView

Browse source
This commit is contained in:
Cheng Zhao 2018-04-08 20:20:43 +09:00
parent 13473ee138
commit 56735d4ff5
6 changed files with 81 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/native_window_views.h
View file

@ -46,12 +46,12 @@ class NativeWindowViews : public NativeWindow,
public views::WidgetDelegateView,
public views::WidgetObserver {
public:
NativeWindowViews(brightray::InspectableWebContents* inspectable_web_contents,
const mate::Dictionary& options,
NativeWindowViews(const mate::Dictionary& options,
NativeWindow* parent);
~NativeWindowViews() override;
// NativeWindow:
void SetContentView(brightray::InspectableWebContents* web_contents) override;
void Close() override;
void CloseImmediately() override;
void Focus(bool focus) override;
@ -61,6 +61,7 @@ class NativeWindowViews : public NativeWindow,
void Hide() override;
bool IsVisible() override;
bool IsEnabled() override;
void SetEnabled(bool enable) override;
void Maximize() override;
void Unmaximize() override;
bool IsMaximized() override;
@ -139,8 +140,6 @@ class NativeWindowViews : public NativeWindow,
void SetIcon(const gfx::ImageSkia& icon);
#endif
void SetEnabled(bool enable) override;
views::Widget* widget() const { return window_.get(); }
views::View* content_view() const { return content_view_; }
SkRegion* draggable_region() const { return draggable_region_.get(); }