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

Correctly free devtools window.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-04 19:02:48 +08:00
parent 01b42c9e59
commit 9f86fa1893
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
browser/devtools_delegate.cc
View file

@ -4,6 +4,7 @@
#include "browser/devtools_delegate.h" #include "browser/devtools_delegate.h"
#include "base/message_loop/message_loop.h"
#include "base/values.h" #include "base/values.h"
#include "browser/native_window.h" #include "browser/native_window.h"
#include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_agent_host.h"
@ -36,6 +37,7 @@ DevToolsDelegate::DevToolsDelegate(NativeWindow* window,
base::DictionaryValue options; base::DictionaryValue options;
options.SetString("title", "DevTools Debugger"); options.SetString("title", "DevTools Debugger");
window->InitFromOptions(&options); window->InitFromOptions(&options);
window->AddObserver(this);
web_contents->GetController().LoadURL( web_contents->GetController().LoadURL(
GURL("chrome-devtools://devtools/devtools.html?dockSide=undocked"), GURL("chrome-devtools://devtools/devtools.html?dockSide=undocked"),
content::Referrer(), content::Referrer(),
@ -51,7 +53,7 @@ void DevToolsDelegate::DispatchOnEmbedder(const std::string& message) {
} }
void DevToolsDelegate::InspectedContentsClosing() { void DevToolsDelegate::InspectedContentsClosing() {
delete owner_window_; owner_window_->Close();
} }
void DevToolsDelegate::AboutToNavigateRenderView( void DevToolsDelegate::AboutToNavigateRenderView(
@ -61,7 +63,7 @@ void DevToolsDelegate::AboutToNavigateRenderView(
} }
void DevToolsDelegate::OnWindowClosed() { void DevToolsDelegate::OnWindowClosed() {
delete owner_window_; base::MessageLoop::current()->DeleteSoon(FROM_HERE, owner_window_);
} }
void DevToolsDelegate::ActivateWindow() { void DevToolsDelegate::ActivateWindow() {
@ -76,7 +78,6 @@ void DevToolsDelegate::MoveWindow(int x, int y) {
} }
void DevToolsDelegate::SetDockSide(const std::string& dock_side) { void DevToolsDelegate::SetDockSide(const std::string& dock_side) {
if (dock_side != "undocked")
owner_window_->Close(); owner_window_->Close();
} }