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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // Adds |host| to the set |hosts_|. 43 // Adds |host| to the set |hosts_|.
44 void AddHost(aura::WindowTreeHost* host); 44 void AddHost(aura::WindowTreeHost* host);
45 45
46 // Removes |host| from the set |hosts_|. 46 // Removes |host| from the set |hosts_|.
47 void RemoveHost(aura::WindowTreeHost* host); 47 void RemoveHost(aura::WindowTreeHost* host);
48 48
49 private: 49 private:
50 // Overridden from wm::NativeCursorManager: 50 // Overridden from wm::NativeCursorManager:
51 virtual void SetDisplay( 51 virtual void SetDisplay(
52 const gfx::Display& display, 52 const gfx::Display& display,
53 wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 53 wm::NativeCursorManagerDelegate* delegate) override;
54 virtual void SetCursor( 54 virtual void SetCursor(
55 gfx::NativeCursor cursor, 55 gfx::NativeCursor cursor,
56 wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 56 wm::NativeCursorManagerDelegate* delegate) override;
57 virtual void SetVisibility( 57 virtual void SetVisibility(
58 bool visible, 58 bool visible,
59 wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 59 wm::NativeCursorManagerDelegate* delegate) override;
60 virtual void SetCursorSet( 60 virtual void SetCursorSet(
61 ui::CursorSetType cursor_set, 61 ui::CursorSetType cursor_set,
62 wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 62 wm::NativeCursorManagerDelegate* delegate) override;
63 virtual void SetMouseEventsEnabled( 63 virtual void SetMouseEventsEnabled(
64 bool enabled, 64 bool enabled,
65 wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 65 wm::NativeCursorManagerDelegate* delegate) override;
66 66
67 // The set of hosts to notify of changes in cursor state. 67 // The set of hosts to notify of changes in cursor state.
68 typedef std::set<aura::WindowTreeHost*> Hosts; 68 typedef std::set<aura::WindowTreeHost*> Hosts;
69 Hosts hosts_; 69 Hosts hosts_;
70 70
71 scoped_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater_; 71 scoped_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater_;
72 scoped_ptr<ui::CursorLoader> cursor_loader_; 72 scoped_ptr<ui::CursorLoader> cursor_loader_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(DesktopNativeCursorManager); 74 DISALLOW_COPY_AND_ASSIGN(DesktopNativeCursorManager);
75 }; 75 };
76 76
77 } // namespace views 77 } // namespace views
78 78
79 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ 79 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_
80 80
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_focus_rules.h ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698