From d1b3ba39bd6f9e9af2bb6bbfe98b6d57e1e310af Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Tue, 29 Nov 2016 18:57:26 +1100 Subject: [PATCH] Fix cpp linting --- atom/browser/api/atom_api_window.cc | 3 ++- atom/browser/api/atom_api_window.h | 3 ++- atom/browser/native_window.h | 5 +++-- atom/browser/native_window_observer.h | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index ae52b03f079a..e031916a0f25 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -282,7 +282,8 @@ void Window::OnExecuteWindowsCommand(const std::string& command_name) { Emit("app-command", command_name); } -void Window::OnTouchBarItemResult(const std::string& item_type, const std::vector& args) { +void Window::OnTouchBarItemResult(const std::string& item_type, + const std::vector& args) { Emit("-touch-bar-interaction", item_type, args); } diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 55347bb54da2..7241982f2b7d 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -85,7 +85,8 @@ class Window : public mate::TrackableObject, void OnRendererUnresponsive() override; void OnRendererResponsive() override; void OnExecuteWindowsCommand(const std::string& command_name) override; - void OnTouchBarItemResult(const std::string& item_type, const std::vector& args) override; + void OnTouchBarItemResult(const std::string& item_type, + const std::vector& args) override; #if defined(OS_WIN) void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override; diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index 38636fa2a5a9..b76a49a061df 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -21,9 +21,9 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" #include "extensions/browser/app_window/size_constraints.h" +#include "native_mate/constructor.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "native_mate/constructor.h" class SkRegion; @@ -233,7 +233,8 @@ class NativeWindow : public base::SupportsUserData, void NotifyWindowEnterHtmlFullScreen(); void NotifyWindowLeaveHtmlFullScreen(); void NotifyWindowExecuteWindowsCommand(const std::string& command); - void NotifyTouchBarItemInteraction(const std::string& item_type, const std::vector& args); + void NotifyTouchBarItemInteraction(const std::string& item_type, + const std::vector& args); #if defined(OS_WIN) void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param); diff --git a/atom/browser/native_window_observer.h b/atom/browser/native_window_observer.h index bd9ff21f56c9..7fd1b7caebd3 100644 --- a/atom/browser/native_window_observer.h +++ b/atom/browser/native_window_observer.h @@ -6,6 +6,7 @@ #define ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_ #include +#include #include "base/strings/string16.h" #include "ui/base/window_open_disposition.h" @@ -70,7 +71,8 @@ class NativeWindowObserver { virtual void OnWindowLeaveFullScreen() {} virtual void OnWindowEnterHtmlFullScreen() {} virtual void OnWindowLeaveHtmlFullScreen() {} - virtual void OnTouchBarItemResult(const std::string& item_type, const std::vector& args) {} + virtual void OnTouchBarItemResult(const std::string& item_type, + const std::vector& args) {} // Called when window message received #if defined(OS_WIN)