Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: ui/wm/core/cursor_manager.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/wm/core/compound_event_filter_unittest.cc ('k') | ui/wm/core/cursor_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/cursor_manager.h
diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h
index f60ef14174ccc7070e52a5af169f83c02bafe943..4f9c21bded75559567ff61c1a1c6618e46d012f1 100644
--- a/ui/wm/core/cursor_manager.h
+++ b/ui/wm/core/cursor_manager.h
@@ -43,33 +43,33 @@ class WM_EXPORT CursorManager : public aura::client::CursorClient,
virtual ~CursorManager();
// Overridden from aura::client::CursorClient:
- virtual void SetCursor(gfx::NativeCursor) OVERRIDE;
- virtual gfx::NativeCursor GetCursor() const OVERRIDE;
- virtual void ShowCursor() OVERRIDE;
- virtual void HideCursor() OVERRIDE;
- virtual bool IsCursorVisible() const OVERRIDE;
- virtual void SetCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
- virtual ui::CursorSetType GetCursorSet() const OVERRIDE;
- virtual void EnableMouseEvents() OVERRIDE;
- virtual void DisableMouseEvents() OVERRIDE;
- virtual bool IsMouseEventsEnabled() const OVERRIDE;
- virtual void SetDisplay(const gfx::Display& display) OVERRIDE;
- virtual void LockCursor() OVERRIDE;
- virtual void UnlockCursor() OVERRIDE;
- virtual bool IsCursorLocked() const OVERRIDE;
+ virtual void SetCursor(gfx::NativeCursor) override;
+ virtual gfx::NativeCursor GetCursor() const override;
+ virtual void ShowCursor() override;
+ virtual void HideCursor() override;
+ virtual bool IsCursorVisible() const override;
+ virtual void SetCursorSet(ui::CursorSetType cursor_set) override;
+ virtual ui::CursorSetType GetCursorSet() const override;
+ virtual void EnableMouseEvents() override;
+ virtual void DisableMouseEvents() override;
+ virtual bool IsMouseEventsEnabled() const override;
+ virtual void SetDisplay(const gfx::Display& display) override;
+ virtual void LockCursor() override;
+ virtual void UnlockCursor() override;
+ virtual bool IsCursorLocked() const override;
virtual void AddObserver(
- aura::client::CursorClientObserver* observer) OVERRIDE;
+ aura::client::CursorClientObserver* observer) override;
virtual void RemoveObserver(
- aura::client::CursorClientObserver* observer) OVERRIDE;
+ aura::client::CursorClientObserver* observer) override;
virtual bool ShouldHideCursorOnKeyEvent(
- const ui::KeyEvent& event) const OVERRIDE;
+ const ui::KeyEvent& event) const override;
private:
// Overridden from NativeCursorManagerDelegate:
- virtual void CommitCursor(gfx::NativeCursor cursor) OVERRIDE;
- virtual void CommitVisibility(bool visible) OVERRIDE;
- virtual void CommitCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
- virtual void CommitMouseEventsEnabled(bool enabled) OVERRIDE;
+ virtual void CommitCursor(gfx::NativeCursor cursor) override;
+ virtual void CommitVisibility(bool visible) override;
+ virtual void CommitCursorSet(ui::CursorSetType cursor_set) override;
+ virtual void CommitMouseEventsEnabled(bool enabled) override;
scoped_ptr<NativeCursorManager> delegate_;
« no previous file with comments | « ui/wm/core/compound_event_filter_unittest.cc ('k') | ui/wm/core/cursor_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698