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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

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 | « components/exo/surface.cc ('k') | content/common/cursors/webcursor_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 3e4916502ec13ec9e8125b4c5bf0c69aaef1754d..94d72f2215c343d064dce218f742f1e1d442a094 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1501,7 +1501,7 @@ void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) {
if (mouse_locked_)
- return ui::kCursorNone;
+ return ui::CursorType::kNone;
return current_cursor_.GetNativeCursor();
}
@@ -2009,8 +2009,8 @@ void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
gfx::NativeCursor cursor = current_cursor_.GetNativeCursor();
// Do not show loading cursor when the cursor is currently hidden.
- if (is_loading_ && cursor != ui::kCursorNone)
- cursor = ui::kCursorPointer;
+ if (is_loading_ && cursor != ui::CursorType::kNone)
+ cursor = ui::Cursor(ui::CursorType::kPointer);
aura::client::CursorClient* cursor_client =
aura::client::GetCursorClient(root_window);
« no previous file with comments | « components/exo/surface.cc ('k') | content/common/cursors/webcursor_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698