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

Make sure WindowClosed message is sent when window is destroyed.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-02 20:08:23 +08:00
parent 21df63fc9b
commit e7aab096e7
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
browser/native_window.h
View file

@ -59,6 +59,9 @@ class NativeWindow : public content::WebContentsDelegate,
static NativeWindow* FromProcessIDAndRoutingID(int process_id,
int routing_id);
// Return all opened windows.
static std::vector<NativeWindow*> windows() { return windows_; }
void InitFromOptions(base::DictionaryValue* options);
virtual void Close() = 0;
@ -92,6 +95,7 @@ class NativeWindow : public content::WebContentsDelegate,
virtual void SetKiosk(bool kiosk) = 0;
virtual bool IsKiosk() = 0;
virtual bool IsClosed() const { return is_closed_; }
virtual void ShowDevTools();
virtual void CloseDevTools();
@ -118,6 +122,8 @@ class NativeWindow : public content::WebContentsDelegate,
return inspectable_web_contents_.get();
}
void NotifyWindowClosed();
// Implementations of content::WebContentsDelegate.
virtual void WebContentsCreated(content::WebContents* source_contents,
int64 source_frame_id,
@ -153,8 +159,9 @@ class NativeWindow : public content::WebContentsDelegate,
// Stores all windows.
static std::vector<NativeWindow*> windows_;
scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
bool is_closed_;
scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
scoped_ptr<brightray::InspectableWebContents> inspectable_web_contents_;
DISALLOW_COPY_AND_ASSIGN(NativeWindow);