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

Unified Diff: ash/utility/screenshot_controller.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: Remove extranious ::ui:: 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
Index: ash/utility/screenshot_controller.cc
diff --git a/ash/utility/screenshot_controller.cc b/ash/utility/screenshot_controller.cc
index d483fa0e9a93c44d6159f0a3127532c6271fa06e..bd9420f5eab4f4844c2275e853f8e06aec8d89ec 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::NONE) {
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::CROSS));
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::CROSS));
}
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::NONE));
}
Update(event);
}

Powered by Google App Engine
This is Rietveld 408576698