github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 15:28:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

💄 NativeWindowClientView no longer needs a extra content view.

Browse Source
This commit is contained in:
Cheng Zhao
2013-10-04 09:04:32 +08:00
parent 4e2d3f3d12
commit ae98d9c8b6
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
browser/native_window_win.cc
View File

@@ -61,21 +61,17 @@ class MenuCommandNativeWidget : public views::NativeWidgetWin {
class NativeWindowClientView : public views::ClientView {
public:
NativeWindowClientView(views::Widget* widget,
views::View* contents_view,
NativeWindowWin* shell)
: views::ClientView(widget, contents_view),
shell_(shell) {
NativeWindowWin* contents_view)
: views::ClientView(widget, contents_view) {
}
virtual ~NativeWindowClientView() {}
virtual bool CanClose() OVERRIDE {
shell_->CloseWebContents();
static_cast<NativeWindowWin*>(contents_view())->CloseWebContents();
return false;
}
private:
NativeWindowWin* shell_;
DISALLOW_COPY_AND_ASSIGN(NativeWindowClientView);
};
@@ -447,7 +443,7 @@ const views::Widget* NativeWindowWin::GetWidget() const {
}
views::ClientView* NativeWindowWin::CreateClientView(views::Widget* widget) {
return new NativeWindowClientView(widget, this, this);
return new NativeWindowClientView(widget, this);
}
views::NonClientFrameView* NativeWindowWin::CreateNonClientFrameView(