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

CommonWebContentsDelegate::DestroyWebContents => ResetManagedWebContents

Browse source
This commit is contained in:
deepak1556 2017-03-22 07:30:36 +05:30
parent 72adbf7a2f
commit 4ab2c92418
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_contents.cc
View file

@ -420,7 +420,7 @@ void WebContents::DestroyWebContents() {
// This event is only for internal use, which is emitted when WebContents is // This event is only for internal use, which is emitted when WebContents is
// being destroyed. // being destroyed.
Emit("will-destroy"); Emit("will-destroy");
CommonWebContentsDelegate::DestroyWebContents(); ResetManagedWebContents();
} }
bool WebContents::DidAddMessageToConsole(content::WebContents* source, bool WebContents::DidAddMessageToConsole(content::WebContents* source,

2
atom/browser/common_web_contents_delegate.cc
View file

@ -183,7 +183,7 @@ void CommonWebContentsDelegate::SetOwnerWindow(
web_contents->SetUserData(relay->key, relay); web_contents->SetUserData(relay->key, relay);
} }
void CommonWebContentsDelegate::DestroyWebContents() { void CommonWebContentsDelegate::ResetManagedWebContents() {
web_contents_.reset(); web_contents_.reset();
} }

6
atom/browser/common_web_contents_delegate.h
View file

@ -42,9 +42,6 @@ class CommonWebContentsDelegate
void SetOwnerWindow(content::WebContents* web_contents, void SetOwnerWindow(content::WebContents* web_contents,
NativeWindow* owner_window); NativeWindow* owner_window);
// Destroy the managed InspectableWebContents object.
void DestroyWebContents();
// Returns the WebContents managed by this delegate. // Returns the WebContents managed by this delegate.
content::WebContents* GetWebContents() const; content::WebContents* GetWebContents() const;
@ -114,6 +111,9 @@ class CommonWebContentsDelegate
std::string* name, std::string* class_name) override; std::string* name, std::string* class_name) override;
#endif #endif
// Destroy the managed InspectableWebContents object.
void ResetManagedWebContents();
private: private:
// Callback for when DevToolsSaveToFile has completed. // Callback for when DevToolsSaveToFile has completed.
void OnDevToolsSaveToFile(const std::string& url); void OnDevToolsSaveToFile(const std::string& url);