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

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

Issue 980453002: ash::CursorWindowController: handle ui::kCursorNone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Need to check |cursor_window_| Created 5 years, 9 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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/base/cursor/cursor.h" 10 #include "ui/base/cursor/cursor.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // Sets the container window for the cursor window controller. 53 // Sets the container window for the cursor window controller.
54 // Closes the cursor window if |container| is NULL. 54 // Closes the cursor window if |container| is NULL.
55 void SetContainer(aura::Window* container); 55 void SetContainer(aura::Window* container);
56 56
57 // Sets the bounds of the container in screen coordinates. 57 // Sets the bounds of the container in screen coordinates.
58 void SetBoundsInScreen(const gfx::Rect& bounds); 58 void SetBoundsInScreen(const gfx::Rect& bounds);
59 59
60 // Updates cursor image based on current cursor state. 60 // Updates cursor image based on current cursor state.
61 void UpdateCursorImage(); 61 void UpdateCursorImage();
62 62
63 // Hides/shows cursor window based on current cursor state.
64 void UpdateCursorVisibility();
65
63 bool is_cursor_compositing_enabled_; 66 bool is_cursor_compositing_enabled_;
64 aura::Window* container_; 67 aura::Window* container_;
65 68
66 // The bounds of the container in screen coordinates. 69 // The bounds of the container in screen coordinates.
67 gfx::Rect bounds_in_screen_; 70 gfx::Rect bounds_in_screen_;
68 71
69 // The native_type of the cursor, see definitions in cursor.h 72 // The native_type of the cursor, see definitions in cursor.h
70 int cursor_type_; 73 int cursor_type_;
71 74
75 // The last requested cursor visibility.
76 bool visible_;
77
72 ui::CursorSetType cursor_set_; 78 ui::CursorSetType cursor_set_;
73 gfx::Display::Rotation cursor_rotation_; 79 gfx::Display::Rotation cursor_rotation_;
74 gfx::Point hot_point_; 80 gfx::Point hot_point_;
75 81
76 // The display on which the cursor is drawn. 82 // The display on which the cursor is drawn.
77 // For mirroring mode, the display is always the primary display. 83 // For mirroring mode, the display is always the primary display.
78 gfx::Display display_; 84 gfx::Display display_;
79 85
80 scoped_ptr<aura::Window> cursor_window_; 86 scoped_ptr<aura::Window> cursor_window_;
81 scoped_ptr<CursorWindowDelegate> delegate_; 87 scoped_ptr<CursorWindowDelegate> delegate_;
82 88
83 DISALLOW_COPY_AND_ASSIGN(CursorWindowController); 89 DISALLOW_COPY_AND_ASSIGN(CursorWindowController);
84 }; 90 };
85 91
86 } // namespace ash 92 } // namespace ash
87 93
88 #endif // ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ 94 #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