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

Side by Side Diff: ash/mus/move_event_handler.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 unified diff | Download patch
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/mus/move_event_handler.h" 5 #include "ash/mus/move_event_handler.h"
6 6
7 #include "ash/mus/bridge/workspace_event_handler_mus.h" 7 #include "ash/mus/bridge/workspace_event_handler_mus.h"
8 #include "ash/wm_window.h" 8 #include "ash/wm_window.h"
9 #include "services/ui/public/interfaces/cursor/cursor.mojom.h" 9 #include "services/ui/public/interfaces/cursor/cursor.mojom.h"
10 #include "ui/aura/mus/window_manager_delegate.h" 10 #include "ui/aura/mus/window_manager_delegate.h"
(...skipping 13 matching lines...) Expand all
24 24
25 } // namespace 25 } // namespace
26 26
27 namespace ash { 27 namespace ash {
28 namespace mus { 28 namespace mus {
29 namespace { 29 namespace {
30 30
31 ui::mojom::CursorType CursorForWindowComponent(int window_component) { 31 ui::mojom::CursorType CursorForWindowComponent(int window_component) {
32 switch (window_component) { 32 switch (window_component) {
33 case HTBOTTOM: 33 case HTBOTTOM:
34 return ui::mojom::CursorType::SOUTH_RESIZE; 34 return ui::mojom::CursorType::kSouthResize;
35 case HTBOTTOMLEFT: 35 case HTBOTTOMLEFT:
36 return ui::mojom::CursorType::SOUTH_WEST_RESIZE; 36 return ui::mojom::CursorType::kSouthWestResize;
37 case HTBOTTOMRIGHT: 37 case HTBOTTOMRIGHT:
38 return ui::mojom::CursorType::SOUTH_EAST_RESIZE; 38 return ui::mojom::CursorType::kSouthEastResize;
39 case HTLEFT: 39 case HTLEFT:
40 return ui::mojom::CursorType::WEST_RESIZE; 40 return ui::mojom::CursorType::kWestResize;
41 case HTRIGHT: 41 case HTRIGHT:
42 return ui::mojom::CursorType::EAST_RESIZE; 42 return ui::mojom::CursorType::kEastResize;
43 case HTTOP: 43 case HTTOP:
44 return ui::mojom::CursorType::NORTH_RESIZE; 44 return ui::mojom::CursorType::kNorthResize;
45 case HTTOPLEFT: 45 case HTTOPLEFT:
46 return ui::mojom::CursorType::NORTH_WEST_RESIZE; 46 return ui::mojom::CursorType::kNorthWestResize;
47 case HTTOPRIGHT: 47 case HTTOPRIGHT:
48 return ui::mojom::CursorType::NORTH_EAST_RESIZE; 48 return ui::mojom::CursorType::kNorthEastResize;
49 default: 49 default:
50 return ui::mojom::CursorType::CURSOR_NULL; 50 return ui::mojom::CursorType::kNull;
51 } 51 }
52 } 52 }
53 53
54 void OnMoveLoopCompleted(const base::Callback<void(bool success)>& end_closure, 54 void OnMoveLoopCompleted(const base::Callback<void(bool success)>& end_closure,
55 wm::WmToplevelWindowEventHandler::DragResult result) { 55 wm::WmToplevelWindowEventHandler::DragResult result) {
56 end_closure.Run(result == 56 end_closure.Run(result ==
57 wm::WmToplevelWindowEventHandler::DragResult::SUCCESS); 57 wm::WmToplevelWindowEventHandler::DragResult::SUCCESS);
58 } 58 }
59 59
60 } // namespace 60 } // namespace
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 toplevel_window_event_handler_.RevertDrag(); 144 toplevel_window_event_handler_.RevertDrag();
145 } 145 }
146 146
147 void MoveEventHandler::OnWindowDestroying(aura::Window* window) { 147 void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
148 DCHECK_EQ(wm_window_->aura_window(), window); 148 DCHECK_EQ(wm_window_->aura_window(), window);
149 Detach(); 149 Detach();
150 } 150 }
151 151
152 } // namespace mus 152 } // namespace mus
153 } // namespace ash 153 } // namespace ash
OLDNEW
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698