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

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