From ae98d9c8b6d1fd2e00e299eaf6bf5907ff6b2359 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 4 Oct 2013 09:04:32 +0800 Subject: [PATCH] :lipstick: NativeWindowClientView no longer needs a extra content view. --- browser/native_window_win.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/browser/native_window_win.cc b/browser/native_window_win.cc index 9219afd..da7978f 100644 --- a/browser/native_window_win.cc +++ b/browser/native_window_win.cc @@ -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(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( -- 2.7.4