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

Side by Side Diff: ash/display/cursor_window_controller.h

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 years, 8 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 | « no previous file | ash/display/cursor_window_controller.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
6 #define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ 6 #define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 const gfx::ImageSkia& GetCursorImageForTest() const; 73 const gfx::ImageSkia& GetCursorImageForTest() const;
74 74
75 bool is_cursor_compositing_enabled_; 75 bool is_cursor_compositing_enabled_;
76 aura::Window* container_; 76 aura::Window* container_;
77 77
78 // The bounds of the container in screen coordinates. 78 // The bounds of the container in screen coordinates.
79 gfx::Rect bounds_in_screen_; 79 gfx::Rect bounds_in_screen_;
80 80
81 // The native_type of the cursor, see definitions in cursor.h 81 // The native_type of the cursor, see definitions in cursor.h
82 int cursor_type_; 82 ui::CursorType cursor_type_;
83 83
84 // The last requested cursor visibility. 84 // The last requested cursor visibility.
85 bool visible_; 85 bool visible_;
86 86
87 ui::CursorSetType cursor_set_; 87 ui::CursorSetType cursor_set_;
88 gfx::Point hot_point_; 88 gfx::Point hot_point_;
89 89
90 int large_cursor_size_in_dip_; 90 int large_cursor_size_in_dip_;
91 91
92 // The display on which the cursor is drawn. 92 // The display on which the cursor is drawn.
93 // For mirroring mode, the display is always the primary display. 93 // For mirroring mode, the display is always the primary display.
94 display::Display display_; 94 display::Display display_;
95 95
96 std::unique_ptr<aura::Window> cursor_window_; 96 std::unique_ptr<aura::Window> cursor_window_;
97 std::unique_ptr<CursorWindowDelegate> delegate_; 97 std::unique_ptr<CursorWindowDelegate> delegate_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(CursorWindowController); 99 DISALLOW_COPY_AND_ASSIGN(CursorWindowController);
100 }; 100 };
101 101
102 } // namespace ash 102 } // namespace ash
103 103
104 #endif // ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ 104 #endif // ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/cursor_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698