From d492ff45d5eb03a9eaf4826661933a275fdb9db3 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Thu, 21 Jan 2016 16:31:09 -0800 Subject: [PATCH] Rename up/down => begin/end --- atom/browser/api/atom_api_window.cc | 8 ++++---- atom/browser/api/atom_api_window.h | 4 ++-- atom/browser/native_window.cc | 8 ++++---- atom/browser/native_window.h | 4 ++-- atom/browser/native_window_observer.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index ef38490d8f7b..fc6c4eaffb74 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -227,12 +227,12 @@ void Window::OnWindowLeaveFullScreen() { Emit("leave-full-screen"); } -void Window::OnWindowScrollTouchUp() { - Emit("scroll-touch-up"); +void Window::OnWindowScrollTouchBegin() { + Emit("scroll-touch-begin"); } -void Window::OnWindowScrollTouchDown() { - Emit("scroll-touch-down"); +void Window::OnWindowScrollTouchEnd() { + Emit("scroll-touch-end"); } void Window::OnWindowEnterHtmlFullScreen() { diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 12eec04680f5..ccbb9ab5f588 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -65,8 +65,8 @@ class Window : public mate::TrackableObject, void OnWindowResize() override; void OnWindowMove() override; void OnWindowMoved() override; - void OnWindowScrollTouchUp() override; - void OnWindowScrollTouchDown() override; + void OnWindowScrollTouchBegin() override; + void OnWindowScrollTouchEnd() override; void OnWindowEnterFullScreen() override; void OnWindowLeaveFullScreen() override; void OnWindowEnterHtmlFullScreen() override; diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 89354381bead..21b32797e8a6 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -442,14 +442,14 @@ void NativeWindow::NotifyWindowEnterFullScreen() { OnWindowEnterFullScreen()); } -void NativeWindow::NotifyWindowScrollTouchUp() { +void NativeWindow::NotifyWindowScrollTouchBegin() { FOR_EACH_OBSERVER(NativeWindowObserver, observers_, - OnWindowScrollTouchUp()); + OnWindowScrollTouchBegin()); } -void NativeWindow::NotifyWindowScrollTouchDown() { +void NativeWindow::NotifyWindowScrollTouchEnd() { FOR_EACH_OBSERVER(NativeWindowObserver, observers_, - OnWindowScrollTouchDown()); + OnWindowScrollTouchEnd()); } void NativeWindow::NotifyWindowLeaveFullScreen() { diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index f1dac26650c7..418f0f35791e 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -205,8 +205,8 @@ class NativeWindow : public base::SupportsUserData, void NotifyWindowMove(); void NotifyWindowResize(); void NotifyWindowMoved(); - void NotifyWindowScrollTouchUp(); - void NotifyWindowScrollTouchDown(); + void NotifyWindowScrollTouchBegin(); + void NotifyWindowScrollTouchEnd(); void NotifyWindowEnterFullScreen(); void NotifyWindowLeaveFullScreen(); void NotifyWindowEnterHtmlFullScreen(); diff --git a/atom/browser/native_window_observer.h b/atom/browser/native_window_observer.h index b7ba9d756f11..4af181085a08 100644 --- a/atom/browser/native_window_observer.h +++ b/atom/browser/native_window_observer.h @@ -50,8 +50,8 @@ class NativeWindowObserver { virtual void OnWindowResize() {} virtual void OnWindowMove() {} virtual void OnWindowMoved() {} - virtual void OnWindowScrollTouchUp() {} - virtual void OnWindowScrollTouchDown() {} + virtual void OnWindowScrollTouchBegin() {} + virtual void OnWindowScrollTouchEnd() {} virtual void OnWindowEnterFullScreen() {} virtual void OnWindowLeaveFullScreen() {} virtual void OnWindowEnterHtmlFullScreen() {}