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

Unified Diff: ash/utility/screenshot_controller.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 | « ash/test/mirror_window_test_api.cc ('k') | ash/wm/ash_native_cursor_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/utility/screenshot_controller.cc
diff --git a/ash/utility/screenshot_controller.cc b/ash/utility/screenshot_controller.cc
index d483fa0e9a93c44d6159f0a3127532c6271fa06e..d8b3d29b8c298af2d8ef56a5f2a1dfdf02f9a1fe 100644
--- a/ash/utility/screenshot_controller.cc
+++ b/ash/utility/screenshot_controller.cc
@@ -204,7 +204,7 @@ class ScreenshotController::ScopedCursorSetter {
return;
gfx::NativeCursor original_cursor = cursor_manager->GetCursor();
cursor_manager_ = cursor_manager;
- if (cursor == ui::kCursorNone) {
+ if (cursor == ui::CursorType::kNone) {
cursor_manager_->HideCursor();
} else {
cursor_manager_->SetCursor(cursor);
@@ -261,8 +261,8 @@ void ScreenshotController::StartWindowScreenshotSession(
}
SetSelectedWindow(wm::GetActiveWindow());
- cursor_setter_.reset(
- new ScopedCursorSetter(Shell::Get()->cursor_manager(), ui::kCursorCross));
+ cursor_setter_.reset(new ScopedCursorSetter(Shell::Get()->cursor_manager(),
+ ui::CursorType::kCross));
EnableMouseWarp(true);
}
@@ -287,7 +287,7 @@ void ScreenshotController::StartPartialScreenshotSession(
if (!pen_events_only_) {
cursor_setter_.reset(new ScopedCursorSetter(Shell::Get()->cursor_manager(),
- ui::kCursorCross));
+ ui::CursorType::kCross));
}
EnableMouseWarp(false);
@@ -340,7 +340,7 @@ void ScreenshotController::MaybeStart(const ui::LocatedEvent& event) {
// called before ctor is called.
cursor_setter_.reset();
cursor_setter_.reset(new ScopedCursorSetter(
- Shell::Get()->cursor_manager(), ui::kCursorNone));
+ Shell::Get()->cursor_manager(), ui::CursorType::kNone));
}
Update(event);
}
« no previous file with comments | « ash/test/mirror_window_test_api.cc ('k') | ash/wm/ash_native_cursor_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698