Commit 68bfb675 authored by Hwanseung Lee's avatar Hwanseung Lee Committed by Commit Bot

Convert enum to enum class for InitialFocusStateOnMousePress

Use enum class instead of enum for InitialFocusStateOnMousePress.
enum class is more type safety.

Bug: 940736
Change-Id: I81dcb02659fe0c6295fa9b8a77684f31e6e8425e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345824
Commit-Queue: Hwanseung Lee <hs1217.lee@samsung.com>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796690}
parent 0dcd7d12
......@@ -731,8 +731,9 @@ bool Label::OnMousePressed(const ui::MouseEvent& event) {
return selection_controller_->OnMousePressed(
event, false,
had_focus ? SelectionController::FOCUSED
: SelectionController::UNFOCUSED);
had_focus
? SelectionController::InitialFocusStateOnMousePress::kFocused
: SelectionController::InitialFocusStateOnMousePress::kUnFocused);
}
bool Label::OnMouseDragged(const ui::MouseEvent& event) {
......
......@@ -764,8 +764,9 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& event) {
return selection_controller_.OnMousePressed(
event, handled,
had_focus ? SelectionController::FOCUSED
: SelectionController::UNFOCUSED);
had_focus
? SelectionController::InitialFocusStateOnMousePress::kFocused
: SelectionController::InitialFocusStateOnMousePress::kUnFocused);
}
bool Textfield::OnMouseDragged(const ui::MouseEvent& event) {
......
......@@ -76,7 +76,7 @@ bool SelectionController::OnMousePressed(
if (event.IsOnlyRightMouseButton()) {
if (PlatformStyle::kSelectAllOnRightClickWhenUnfocused &&
initial_focus_state == InitialFocusStateOnMousePress::UNFOCUSED) {
initial_focus_state == InitialFocusStateOnMousePress::kUnFocused) {
SelectAll();
} else if (PlatformStyle::kSelectWordOnRightClick &&
!render_text->IsPointInSelection(event.location()) &&
......
......@@ -30,9 +30,9 @@ class VIEWS_EXPORT SelectionController {
public:
// Describes whether the view managing the delegate was initially focused when
// the mouse press was received.
enum InitialFocusStateOnMousePress {
FOCUSED,
UNFOCUSED,
enum class InitialFocusStateOnMousePress {
kFocused,
kUnFocused,
};
// |delegate| must be non-null.
......
......@@ -123,8 +123,9 @@ class SelectionControllerTest : public ::testing::Test {
ui::MouseEvent(ui::ET_MOUSE_PRESSED, location, location,
last_event_time_, mouse_flags_, button),
false,
focused ? SelectionController::FOCUSED
: SelectionController::UNFOCUSED);
focused
? SelectionController::InitialFocusStateOnMousePress::kFocused
: SelectionController::InitialFocusStateOnMousePress::kUnFocused);
}
void ReleaseMouseButton(int button) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment