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

Side by Side Diff: trunk/src/ash/wm/ash_native_cursor_manager.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 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Overridden from ::wm::NativeCursorManager: 45 // Overridden from ::wm::NativeCursorManager:
46 virtual void SetDisplay( 46 virtual void SetDisplay(
47 const gfx::Display& display, 47 const gfx::Display& display,
48 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 48 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
49 virtual void SetCursor( 49 virtual void SetCursor(
50 gfx::NativeCursor cursor, 50 gfx::NativeCursor cursor,
51 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 51 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
52 virtual void SetVisibility( 52 virtual void SetVisibility(
53 bool visible, 53 bool visible,
54 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 54 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
55 virtual void SetScale(
56 float scale,
57 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
55 virtual void SetCursorSet( 58 virtual void SetCursorSet(
56 ui::CursorSetType cursor_set, 59 ui::CursorSetType cursor_set,
57 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 60 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
58 virtual void SetMouseEventsEnabled( 61 virtual void SetMouseEventsEnabled(
59 bool enabled, 62 bool enabled,
60 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; 63 ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
61 64
62 // The cursor location where the cursor was disabled. 65 // The cursor location where the cursor was disabled.
63 gfx::Point disabled_cursor_location_; 66 gfx::Point disabled_cursor_location_;
64 67
65 bool native_cursor_enabled_; 68 bool native_cursor_enabled_;
66 69
67 scoped_ptr<ImageCursors> image_cursors_; 70 scoped_ptr<ImageCursors> image_cursors_;
68 71
69 DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager); 72 DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager);
70 }; 73 };
71 74
72 } // namespace ash 75 } // namespace ash
73 76
74 #endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 77 #endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/test/cursor_manager_test_api.cc ('k') | trunk/src/ash/wm/ash_native_cursor_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698