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

Merge pull request #6981 from electron/typo-in-method-name

Browse source 
Correct misspelling of destroy in method name
This commit is contained in:
Kevin Sawicki 2016-08-25 13:45:42 -07:00 • committed by GitHub
commit e14e92147d
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ void Window::WillCloseWindow(bool* prevent_default) {
*prevent_default = Emit("close"); *prevent_default = Emit("close");
} }
void Window::WillDestoryNativeObject() { void Window::WillDestroyNativeObject() {
// Close all child windows before closing current window. // Close all child windows before closing current window.
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());

2
atom/browser/api/atom_api_window.h
View file

@ -58,7 +58,7 @@ class Window : public mate::TrackableObject<Window>,
// NativeWindowObserver: // NativeWindowObserver:
void WillCloseWindow(bool* prevent_default) override; void WillCloseWindow(bool* prevent_default) override;
void WillDestoryNativeObject() override; void WillDestroyNativeObject() override;
void OnWindowClosed() override; void OnWindowClosed() override;
void OnWindowBlur() override; void OnWindowBlur() override;
void OnWindowFocus() override; void OnWindowFocus() override;

2
atom/browser/native_window.cc
View file

@ -405,7 +405,7 @@ void NativeWindow::CloseContents(content::WebContents* source) {
Observe(nullptr); Observe(nullptr);
FOR_EACH_OBSERVER(NativeWindowObserver, observers_, FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
WillDestoryNativeObject()); WillDestroyNativeObject());
// When the web contents is gone, close the window immediately, but the // When the web contents is gone, close the window immediately, but the
// memory will not be freed until you call delete. // memory will not be freed until you call delete.

2
atom/browser/native_window_observer.h
View file

@ -34,7 +34,7 @@ class NativeWindowObserver {
virtual void WillCloseWindow(bool* prevent_default) {} virtual void WillCloseWindow(bool* prevent_default) {}
// Called before the native window object is going to be destroyed. // Called before the native window object is going to be destroyed.
virtual void WillDestoryNativeObject() {} virtual void WillDestroyNativeObject() {}
// Called when the window is closed. // Called when the window is closed.
virtual void OnWindowClosed() {} virtual void OnWindowClosed() {}