From 48515d9eccbcb9d9c0b765a76e5af021f41be187 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 28 Feb 2017 12:33:56 -0800 Subject: [PATCH] Ignore objective-c header lint --- atom/browser/native_window_mac.mm | 3 +-- script/cpplint.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 9ef09f625dfd..c4f127459d1d 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -11,7 +11,6 @@ #include "atom/browser/window_list.h" #include "atom/common/color_util.h" #include "atom/common/draggable_region.h" -#include "atom/common/native_mate_converters/image_converter.h" #include "atom/common/options_switches.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" @@ -396,7 +395,7 @@ bool ScopedDisableResize::disable_resize_ = false; // NSWindow overrides. -- (void)swipeWithEvent:(NSEvent*)event { +- (void)swipeWithEvent:(NSEvent *)event { if (event.deltaY == 1.0) { shell_->NotifyWindowSwipe("up"); } else if (event.deltaX == -1.0) { diff --git a/script/cpplint.py b/script/cpplint.py index 9d9281fb70a1..6c715522f8ce 100755 --- a/script/cpplint.py +++ b/script/cpplint.py @@ -9,10 +9,11 @@ from lib.util import execute IGNORE_FILES = [ os.path.join('atom', 'browser', 'mac', 'atom_application.h'), os.path.join('atom', 'browser', 'mac', 'atom_application_delegate.h'), - os.path.join('atom', 'browser', 'ui', 'cocoa', - 'touch_bar_forward_declarations.h'), os.path.join('atom', 'browser', 'resources', 'win', 'resource.h'), os.path.join('atom', 'browser', 'ui', 'cocoa', 'atom_menu_controller.h'), + os.path.join('atom', 'browser', 'ui', 'cocoa', 'atom_touch_bar.h'), + os.path.join('atom', 'browser', 'ui', 'cocoa', + 'touch_bar_forward_declarations.h'), os.path.join('atom', 'common', 'api', 'api_messages.h'), os.path.join('atom', 'common', 'common_message_generator.cc'), os.path.join('atom', 'common', 'common_message_generator.h'),