scoped_ptr.PassAs is removed
This commit is contained in:
parent
43421aedcf
commit
5c78ecfe40
21 changed files with 84 additions and 85 deletions
|
@ -41,12 +41,12 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener {
|
|||
bool OnMediaOrVolumeKeyEvent(int key_code);
|
||||
|
||||
// GlobalShortcutListener implementation.
|
||||
virtual void StartListening() OVERRIDE;
|
||||
virtual void StopListening() OVERRIDE;
|
||||
virtual void StartListening() override;
|
||||
virtual void StopListening() override;
|
||||
virtual bool RegisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) OVERRIDE;
|
||||
const ui::Accelerator& accelerator) override;
|
||||
virtual void UnregisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) OVERRIDE;
|
||||
const ui::Accelerator& accelerator) override;
|
||||
|
||||
// Mac-specific functions for registering hot keys with modifiers.
|
||||
bool RegisterHotKey(const ui::Accelerator& accelerator, KeyId hot_key_id);
|
||||
|
|
|
@ -26,15 +26,15 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener,
|
|||
virtual void OnWndProc(HWND hwnd,
|
||||
UINT message,
|
||||
WPARAM wparam,
|
||||
LPARAM lparam) OVERRIDE;
|
||||
LPARAM lparam) override;
|
||||
|
||||
// GlobalShortcutListener implementation.
|
||||
virtual void StartListening() OVERRIDE;
|
||||
virtual void StopListening() OVERRIDE;
|
||||
virtual void StartListening() override;
|
||||
virtual void StopListening() override;
|
||||
virtual bool RegisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) OVERRIDE;
|
||||
const ui::Accelerator& accelerator) override;
|
||||
virtual void UnregisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) OVERRIDE;
|
||||
const ui::Accelerator& accelerator) override;
|
||||
|
||||
// Whether this object is listening for global shortcuts.
|
||||
bool is_listening_;
|
||||
|
|
|
@ -23,17 +23,17 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener,
|
|||
virtual ~GlobalShortcutListenerX11();
|
||||
|
||||
// ui::PlatformEventDispatcher implementation.
|
||||
virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
|
||||
virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
|
||||
virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
|
||||
virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
|
||||
|
||||
private:
|
||||
// GlobalShortcutListener implementation.
|
||||
virtual void StartListening() OVERRIDE;
|
||||
virtual void StopListening() OVERRIDE;
|
||||
virtual void StartListening() override;
|
||||
virtual void StopListening() override;
|
||||
virtual bool RegisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) OVERRIDE;
|
||||
const ui::Accelerator& accelerator) override;
|
||||
virtual void UnregisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) OVERRIDE;
|
||||
const ui::Accelerator& accelerator) override;
|
||||
|
||||
// Invoked when a global shortcut is pressed.
|
||||
void OnXKeyPressEvent(::XEvent* x_event);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue