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

Unified Diff: ui/base/cursor/ozone/bitmap_cursor_factory_ozone.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/cursor/image_cursors.cc ('k') | ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
diff --git a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
index de7352d5939877291242874aa372b23b6841ffe9..7a8a2d6fe27e95909937366ccf3daa13407223bd 100644
--- a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
+++ b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
@@ -61,7 +61,7 @@ class UI_BASE_EXPORT BitmapCursorFactoryOzone : public CursorFactoryOzone {
PlatformCursor platform_cursor);
// CursorFactoryOzone:
- PlatformCursor GetDefaultCursor(int type) override;
+ PlatformCursor GetDefaultCursor(CursorType type) override;
PlatformCursor CreateImageCursor(const SkBitmap& bitmap,
const gfx::Point& hotspot,
float bitmap_dpi) override;
@@ -74,10 +74,11 @@ class UI_BASE_EXPORT BitmapCursorFactoryOzone : public CursorFactoryOzone {
private:
// Get cached BitmapCursorOzone for a default cursor.
- scoped_refptr<BitmapCursorOzone> GetDefaultCursorInternal(int type);
+ scoped_refptr<BitmapCursorOzone> GetDefaultCursorInternal(CursorType type);
// Default cursors are cached & owned by the factory.
- typedef std::map<int, scoped_refptr<BitmapCursorOzone> > DefaultCursorMap;
+ typedef std::map<CursorType, scoped_refptr<BitmapCursorOzone>>
+ DefaultCursorMap;
DefaultCursorMap default_cursors_;
DISALLOW_COPY_AND_ASSIGN(BitmapCursorFactoryOzone);
« no previous file with comments | « ui/base/cursor/image_cursors.cc ('k') | ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698