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

views: Don't leak ViewsDelegate.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-04 21:41:22 +08:00
parent 651ebdde65
commit 7a196933bb
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/browser_main_parts.cc
View file

@ -50,9 +50,7 @@ void BrowserMainParts::ToolkitInitialized() {
#endif #endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
if (!views::ViewsDelegate::views_delegate) views_delegate_.reset(new ViewsDelegate);
views::ViewsDelegate::views_delegate = new ViewsDelegate;
wm_state_.reset(new wm::WMState); wm_state_.reset(new wm::WMState);
#endif #endif
} }

5
brightray/browser/browser_main_parts.h
View file

@ -10,6 +10,10 @@
#include "content/public/browser/browser_main_parts.h" #include "content/public/browser/browser_main_parts.h"
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
namespace brightray {
class ViewsDelegate;
}
namespace wm { namespace wm {
class WMState; class WMState;
} }
@ -53,6 +57,7 @@ class BrowserMainParts : public content::BrowserMainParts {
scoped_ptr<WebUIControllerFactory> web_ui_controller_factory_; scoped_ptr<WebUIControllerFactory> web_ui_controller_factory_;
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
scoped_ptr<ViewsDelegate> views_delegate_;
scoped_ptr<wm::WMState> wm_state_; scoped_ptr<wm::WMState> wm_state_;
#endif #endif

4
brightray/browser/views/views_delegate.cc
View file

@ -9,9 +9,13 @@
namespace brightray { namespace brightray {
ViewsDelegate::ViewsDelegate() { ViewsDelegate::ViewsDelegate() {
DCHECK(!views::ViewsDelegate::views_delegate);
views::ViewsDelegate::views_delegate = this;
} }
ViewsDelegate::~ViewsDelegate() { ViewsDelegate::~ViewsDelegate() {
DCHECK_EQ(views::ViewsDelegate::views_delegate, this);
views::ViewsDelegate::views_delegate = NULL;
} }
void ViewsDelegate::SaveWindowPlacement(const views::Widget* window, void ViewsDelegate::SaveWindowPlacement(const views::Widget* window,