mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Nits: Fix code style.

Browse source
This commit is contained in:
Haojian Wu 2014-07-30 21:18:26 +08:00
parent 9342d59a7c
commit b2217474c1
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_shortcut.cc
View file

@ -69,11 +69,13 @@ void Shortcut::Register() {
} }
void Shortcut::Unregister() { void Shortcut::Unregister() {
GlobalShortcutListener::GetInstance()->UnregisterAccelerator(accelerator_, this); GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
accelerator_, this);
} }
bool Shortcut::IsRegistered() { bool Shortcut::IsRegistered() {
return GlobalShortcutListener::GetInstance()->IsAcceleratorRegistered(accelerator_); return GlobalShortcutListener::GetInstance()->IsAcceleratorRegistered(
accelerator_);
} }
// static // static

4
atom/browser/api/atom_api_shortcut.h
View file

@ -42,8 +42,8 @@ class Shortcut : public mate::EventEmitter,
return accelerator_; return accelerator_;
} }
void OnActive() ; void OnActive();
void OnFailed(const std::string& error_msg) ; void OnFailed(const std::string& error_msg);
// GlobalShortcutListener::Observer implementation. // GlobalShortcutListener::Observer implementation.
virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE;