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

Unified Diff: ui/base/cursor/cursor.h

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/shared/compound_event_filter_unittest.cc ('k') | ui/base/cursor/cursor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cursor/cursor.h
diff --git a/ui/base/cursor/cursor.h b/ui/base/cursor/cursor.h
index 2383274f95f25c2bf154178ac8022bd6f9c8623a..43c201db37bc105cf8956efc6e05d10c35155bf3 100644
--- a/ui/base/cursor/cursor.h
+++ b/ui/base/cursor/cursor.h
@@ -102,16 +102,24 @@ class UI_EXPORT Cursor {
int native_type() const { return native_type_; }
PlatformCursor platform() const { return platform_cursor_; }
+ float device_scale_factor() const {
+ return device_scale_factor_;
+ }
+ void set_device_scale_factor(float device_scale_factor) {
+ device_scale_factor_ = device_scale_factor;
+ }
bool operator==(int type) const { return native_type_ == type; }
bool operator==(const Cursor& cursor) const {
return native_type_ == cursor.native_type_ &&
- platform_cursor_ == cursor.platform_cursor_;
+ platform_cursor_ == cursor.platform_cursor_ &&
+ device_scale_factor_ == cursor.device_scale_factor_;
}
bool operator!=(int type) const { return native_type_ != type; }
bool operator!=(const Cursor& cursor) const {
return native_type_ != cursor.native_type_ ||
- platform_cursor_ != cursor.platform_cursor_;
+ platform_cursor_ != cursor.platform_cursor_ ||
+ device_scale_factor_ != cursor.device_scale_factor_;
}
void operator=(const Cursor& cursor) {
@@ -125,6 +133,9 @@ class UI_EXPORT Cursor {
int native_type_;
PlatformCursor platform_cursor_;
+
+ // The device scale factor for the cursor.
+ float device_scale_factor_;
};
} // namespace ui
« no previous file with comments | « ui/aura/shared/compound_event_filter_unittest.cc ('k') | ui/base/cursor/cursor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698