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

Unified Diff: extensions/shell/browser/shell_desktop_controller_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 | « content/common/cursors/webcursor_aura.cc ('k') | mash/simple_wm/move_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_desktop_controller_aura.cc
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc
index dfbecf8906de9c3b4abe7edda2f1c785f7c88aad..a76f6237437563fae12324ec586a948cde687cd3 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.cc
+++ b/extensions/shell/browser/shell_desktop_controller_aura.cc
@@ -128,7 +128,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager {
if (visible) {
SetCursor(delegate->GetCursor(), delegate);
} else {
- gfx::NativeCursor invisible_cursor(ui::kCursorNone);
+ gfx::NativeCursor invisible_cursor(ui::CursorType::kNone);
image_cursors_->SetPlatformCursor(&invisible_cursor);
ApplyCursor(invisible_cursor);
}
@@ -308,7 +308,7 @@ void ShellDesktopControllerAura::InitWindowManager() {
new ShellNativeCursorManager(host_.get()))));
cursor_manager_->SetDisplay(
display::Screen::GetScreen()->GetPrimaryDisplay());
- cursor_manager_->SetCursor(ui::kCursorPointer);
+ cursor_manager_->SetCursor(ui::CursorType::kPointer);
aura::client::SetCursorClient(host_->window(), cursor_manager_.get());
user_activity_detector_.reset(new ui::UserActivityDetector);
« no previous file with comments | « content/common/cursors/webcursor_aura.cc ('k') | mash/simple_wm/move_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698