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

Side by Side Diff: trunk/src/ui/aura/client/cursor_client.h

Issue 233693002: Revert 263043 "Remove obsolete scale related APIs for cursor" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
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_AURA_CLIENT_CURSOR_CLIENT_H_ 5 #ifndef UI_AURA_CLIENT_CURSOR_CLIENT_H_
6 #define UI_AURA_CLIENT_CURSOR_CLIENT_H_ 6 #define UI_AURA_CLIENT_CURSOR_CLIENT_H_
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "ui/aura/aura_export.h" 9 #include "ui/aura/aura_export.h"
10 #include "ui/base/cursor/cursor.h" 10 #include "ui/base/cursor/cursor.h"
(...skipping 21 matching lines...) Expand all
32 // Returns the current cursor. 32 // Returns the current cursor.
33 virtual gfx::NativeCursor GetCursor() const = 0; 33 virtual gfx::NativeCursor GetCursor() const = 0;
34 34
35 // Shows the cursor. This does not take effect When mouse events are disabled. 35 // Shows the cursor. This does not take effect When mouse events are disabled.
36 virtual void ShowCursor() = 0; 36 virtual void ShowCursor() = 0;
37 37
38 // Hides the cursor. Mouse events keep being sent even when the cursor is 38 // Hides the cursor. Mouse events keep being sent even when the cursor is
39 // invisible. 39 // invisible.
40 virtual void HideCursor() = 0; 40 virtual void HideCursor() = 0;
41 41
42 // Sets the scale of the mouse cursor icon.
43 virtual void SetScale(float scale) = 0;
44
45 // Gets the current scale of the mouse cursor icon.
46 virtual float GetScale() const = 0;
47
42 // Sets the type of the mouse cursor icon. 48 // Sets the type of the mouse cursor icon.
43 virtual void SetCursorSet(ui::CursorSetType cursor_set) = 0; 49 virtual void SetCursorSet(ui::CursorSetType cursor_set) = 0;
44 50
45 // Gets the type of the mouse cursor icon. 51 // Gets the type of the mouse cursor icon.
46 virtual ui::CursorSetType GetCursorSet() const = 0; 52 virtual ui::CursorSetType GetCursorSet() const = 0;
47 53
48 // Gets whether the cursor is visible. 54 // Gets whether the cursor is visible.
49 virtual bool IsCursorVisible() const = 0; 55 virtual bool IsCursorVisible() const = 0;
50 56
51 // Makes mouse events start being sent and shows the cursor if it was hidden 57 // Makes mouse events start being sent and shows the cursor if it was hidden
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 93
88 // Sets/Gets the activation client for the specified window. 94 // Sets/Gets the activation client for the specified window.
89 AURA_EXPORT void SetCursorClient(Window* window, 95 AURA_EXPORT void SetCursorClient(Window* window,
90 CursorClient* client); 96 CursorClient* client);
91 AURA_EXPORT CursorClient* GetCursorClient(Window* window); 97 AURA_EXPORT CursorClient* GetCursorClient(Window* window);
92 98
93 } // namespace client 99 } // namespace client
94 } // namespace aura 100 } // namespace aura
95 101
96 #endif // UI_AURA_CLIENT_CURSOR_CLIENT_H_ 102 #endif // UI_AURA_CLIENT_CURSOR_CLIENT_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/wm/ash_native_cursor_manager_unittest.cc ('k') | trunk/src/ui/aura/test/test_cursor_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698