From 7a0129bbc7a5db2f453acb4addf40b39f5989021 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 25 Aug 2016 11:24:16 -0700 Subject: [PATCH] Correct misspelling of destroy in method name --- atom/browser/api/atom_api_window.cc | 2 +- atom/browser/api/atom_api_window.h | 2 +- atom/browser/native_window.cc | 2 +- atom/browser/native_window_observer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index acc4d60581be..280e2fe414b4 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -137,7 +137,7 @@ void Window::WillCloseWindow(bool* prevent_default) { *prevent_default = Emit("close"); } -void Window::WillDestoryNativeObject() { +void Window::WillDestroyNativeObject() { // Close all child windows before closing current window. v8::Locker locker(isolate()); v8::HandleScope handle_scope(isolate()); diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 7c649793948f..9dc64fdb8745 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -58,7 +58,7 @@ class Window : public mate::TrackableObject, // NativeWindowObserver: void WillCloseWindow(bool* prevent_default) override; - void WillDestoryNativeObject() override; + void WillDestroyNativeObject() override; void OnWindowClosed() override; void OnWindowBlur() override; void OnWindowFocus() override; diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 9008b6b2240d..a3404ebdf851 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -405,7 +405,7 @@ void NativeWindow::CloseContents(content::WebContents* source) { Observe(nullptr); FOR_EACH_OBSERVER(NativeWindowObserver, observers_, - WillDestoryNativeObject()); + WillDestroyNativeObject()); // When the web contents is gone, close the window immediately, but the // memory will not be freed until you call delete. diff --git a/atom/browser/native_window_observer.h b/atom/browser/native_window_observer.h index 16541d090900..b2bc588c3013 100644 --- a/atom/browser/native_window_observer.h +++ b/atom/browser/native_window_observer.h @@ -34,7 +34,7 @@ class NativeWindowObserver { virtual void WillCloseWindow(bool* prevent_default) {} // Called before the native window object is going to be destroyed. - virtual void WillDestoryNativeObject() {} + virtual void WillDestroyNativeObject() {} // Called when the window is closed. virtual void OnWindowClosed() {}