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

Side by Side Diff: ash/wm/ash_native_cursor_manager.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ash/wm/ash_focus_rules.h ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 5 #ifndef ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
6 #define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 6 #define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 29 matching lines...) Expand all
40 // cursor regardless of visibility state, and let CursorWindowManager draw 40 // cursor regardless of visibility state, and let CursorWindowManager draw
41 // the cursor. 41 // the cursor.
42 void SetNativeCursorEnabled(bool enabled); 42 void SetNativeCursorEnabled(bool enabled);
43 43
44 private: 44 private:
45 friend class test::CursorManagerTestApi; 45 friend class test::CursorManagerTestApi;
46 46
47 // Overridden from ::wm::NativeCursorManager: 47 // Overridden from ::wm::NativeCursorManager:
48 virtual void SetDisplay( 48 virtual void SetDisplay(
49 const gfx::Display& display, 49 const gfx::Display& display,
50 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 50 ::wm::NativeCursorManagerDelegate* delegate) override;
51 virtual void SetCursor( 51 virtual void SetCursor(
52 gfx::NativeCursor cursor, 52 gfx::NativeCursor cursor,
53 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 53 ::wm::NativeCursorManagerDelegate* delegate) override;
54 virtual void SetVisibility( 54 virtual void SetVisibility(
55 bool visible, 55 bool visible,
56 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 56 ::wm::NativeCursorManagerDelegate* delegate) override;
57 virtual void SetCursorSet( 57 virtual void SetCursorSet(
58 ui::CursorSetType cursor_set, 58 ui::CursorSetType cursor_set,
59 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 59 ::wm::NativeCursorManagerDelegate* delegate) override;
60 virtual void SetMouseEventsEnabled( 60 virtual void SetMouseEventsEnabled(
61 bool enabled, 61 bool enabled,
62 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 62 ::wm::NativeCursorManagerDelegate* delegate) override;
63 63
64 // The cursor location where the cursor was disabled. 64 // The cursor location where the cursor was disabled.
65 gfx::Point disabled_cursor_location_; 65 gfx::Point disabled_cursor_location_;
66 66
67 bool native_cursor_enabled_; 67 bool native_cursor_enabled_;
68 68
69 scoped_ptr<ui::ImageCursors> image_cursors_; 69 scoped_ptr<ui::ImageCursors> image_cursors_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager); 71 DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager);
72 }; 72 };
73 73
74 } // namespace ash 74 } // namespace ash
75 75
76 #endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 76 #endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/ash_focus_rules.h ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698