From cdc502230561d7e67c019034a6ffce9d7d748c40 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Thu, 3 May 2018 07:04:22 -0700 Subject: [PATCH] Fix chromium-style errors (#12802) --- atom/browser/api/atom_api_power_monitor_mac.mm | 4 ++-- atom/browser/ui/views/frameless_view.h | 2 +- atom/browser/ui/views/menu_model_adapter.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_power_monitor_mac.mm b/atom/browser/api/atom_api_power_monitor_mac.mm index 821f2057807..3d14e87449d 100644 --- a/atom/browser/api/atom_api_power_monitor_mac.mm +++ b/atom/browser/api/atom_api_power_monitor_mac.mm @@ -44,13 +44,13 @@ } - (void)onScreenLocked:(NSNotification*)notification { - for (auto& emitter : self->emitters) { + for (auto*& emitter : self->emitters) { emitter->Emit("lock-screen"); } } - (void)onScreenUnlocked:(NSNotification*)notification { - for (auto& emitter : self->emitters) { + for (auto*& emitter : self->emitters) { emitter->Emit("unlock-screen"); } } diff --git a/atom/browser/ui/views/frameless_view.h b/atom/browser/ui/views/frameless_view.h index ff8b44d2c9d..360b5bea973 100644 --- a/atom/browser/ui/views/frameless_view.h +++ b/atom/browser/ui/views/frameless_view.h @@ -18,7 +18,7 @@ class NativeWindowViews; class FramelessView : public views::NonClientFrameView { public: FramelessView(); - virtual ~FramelessView(); + ~FramelessView() override; virtual void Init(NativeWindowViews* window, views::Widget* frame); diff --git a/atom/browser/ui/views/menu_model_adapter.h b/atom/browser/ui/views/menu_model_adapter.h index 4b87bc32fd5..05c2c88a7b7 100644 --- a/atom/browser/ui/views/menu_model_adapter.h +++ b/atom/browser/ui/views/menu_model_adapter.h @@ -13,7 +13,7 @@ namespace atom { class MenuModelAdapter : public views::MenuModelAdapter { public: explicit MenuModelAdapter(AtomMenuModel* menu_model); - virtual ~MenuModelAdapter(); + ~MenuModelAdapter() override; protected: bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;