Fix cpp linting
authorSamuel Attard <samuel.r.attard@gmail.com>
Tue, 29 Nov 2016 07:57:26 +0000 (18:57 +1100)
committerKevin Sawicki <kevinsawicki@gmail.com>
Fri, 3 Mar 2017 22:00:38 +0000 (14:00 -0800)
atom/browser/api/atom_api_window.cc
atom/browser/api/atom_api_window.h
atom/browser/native_window.h
atom/browser/native_window_observer.h

index ae52b03f079a5bfb4ff5d1b695880533d24fab39..e031916a0f25999ce8acb96e3897444260b2f10f 100644 (file)
@@ -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<std::string>& args) {
+void Window::OnTouchBarItemResult(const std::string& item_type,
+                                  const std::vector<std::string>& args) {
   Emit("-touch-bar-interaction", item_type, args);
 }
 
index 55347bb54da2adcd357c42e958da1ff480823680..7241982f2b7d6179e35d2739c0ad3e156c574e76 100644 (file)
@@ -85,7 +85,8 @@ class Window : public mate::TrackableObject<Window>,
   void OnRendererUnresponsive() override;
   void OnRendererResponsive() override;
   void OnExecuteWindowsCommand(const std::string& command_name) override;
-  void OnTouchBarItemResult(const std::string& item_type, const std::vector<std::string>& args) override;
+  void OnTouchBarItemResult(const std::string& item_type,
+                            const std::vector<std::string>& args) override;
 
   #if defined(OS_WIN)
   void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
index 38636fa2a5a903ee4c0e410789c90bb48e391e6a..b76a49a061df2a13d5cb4ba89d5c37bd49c8b4e0 100644 (file)
@@ -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<std::string>& args);
+  void NotifyTouchBarItemInteraction(const std::string& item_type,
+                                     const std::vector<std::string>& args);
 
   #if defined(OS_WIN)
   void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);
index bd9ff21f56c91dc74d43b114415798c974f9feca..7fd1b7caebd37f0ec3d85e1b8adde37754f8c539 100644 (file)
@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
 
 #include <string>
+#include <vector>
 
 #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<std::string>& args) {}
+  virtual void OnTouchBarItemResult(const std::string& item_type,
+                                    const std::vector<std::string>& args) {}
 
   // Called when window message received
   #if defined(OS_WIN)