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

views: Follow WidgetDelegateView's convention on deleting self.

Browse source 
It could avoid invoking WidgetDelegate's methods when the delegate has been
deleted as a view.
This commit is contained in:
Cheng Zhao 2014-07-09 11:01:19 +08:00
parent 9747ee4411
commit a5bb24284e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
brightray/browser/views/inspectable_web_contents_view_views.cc
View file

@ -23,10 +23,14 @@ class DevToolsWindowDelegate : public views::ClientView,
shell_(shell), shell_(shell),
view_(view), view_(view),
widget_(widget), widget_(widget),
title_(base::ASCIIToUTF16("Developer Tools")) {} title_(base::ASCIIToUTF16("Developer Tools")) {
// A WidgetDelegate should be deleted on DeleteDelegate.
set_owned_by_client();
}
virtual ~DevToolsWindowDelegate() {} virtual ~DevToolsWindowDelegate() {}
// views::WidgetDelegate: // views::WidgetDelegate:
virtual void DeleteDelegate() OVERRIDE { delete this; }
virtual views::View* GetInitiallyFocusedView() OVERRIDE { return view_; } virtual views::View* GetInitiallyFocusedView() OVERRIDE { return view_; }
virtual bool CanResize() const OVERRIDE { return true; } virtual bool CanResize() const OVERRIDE { return true; }
virtual bool CanMaximize() const OVERRIDE { return false; } virtual bool CanMaximize() const OVERRIDE { return false; }
@ -136,8 +140,6 @@ void InspectableWebContentsViewViews::SetIsDocked(bool docked) {
views::Widget::InitParams params; views::Widget::InitParams params;
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
// The delegate is also a ClientView, so it would deleted when the view
// destructs, no need to delete it in DeleteDelegate.
params.delegate = new DevToolsWindowDelegate(this, params.delegate = new DevToolsWindowDelegate(this,
devtools_window_web_view_, devtools_window_web_view_,
devtools_window_.get()); devtools_window_.get());