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

Side by Side Diff: services/ui/ws/server_window.h

Issue 2378883002: mus ws: Consistently use mojom::Cursor instead of int32_t. (Closed)
Patch Set: Created 4 years, 2 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 | « services/ui/ws/platform_display.cc ('k') | services/ui/ws/server_window.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_ 5 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_
6 #define SERVICES_UI_WS_SERVER_WINDOW_H_ 6 #define SERVICES_UI_WS_SERVER_WINDOW_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 void SetClientArea(const gfx::Insets& insets, 82 void SetClientArea(const gfx::Insets& insets,
83 const std::vector<gfx::Rect>& additional_client_areas); 83 const std::vector<gfx::Rect>& additional_client_areas);
84 84
85 const gfx::Rect* hit_test_mask() const { return hit_test_mask_.get(); } 85 const gfx::Rect* hit_test_mask() const { return hit_test_mask_.get(); }
86 void SetHitTestMask(const gfx::Rect& mask); 86 void SetHitTestMask(const gfx::Rect& mask);
87 void ClearHitTestMask(); 87 void ClearHitTestMask();
88 88
89 bool can_accept_drops() const { return accepts_drops_; } 89 bool can_accept_drops() const { return accepts_drops_; }
90 void SetCanAcceptDrops(bool accepts_drags); 90 void SetCanAcceptDrops(bool accepts_drags);
91 91
92 int32_t cursor() const { return static_cast<int32_t>(cursor_id_); } 92 ui::mojom::Cursor cursor() const { return cursor_id_; }
93 int32_t non_client_cursor() const { 93 ui::mojom::Cursor non_client_cursor() const {
94 return static_cast<int32_t>(non_client_cursor_id_); 94 return non_client_cursor_id_;
95 } 95 }
96 96
97 const ServerWindow* parent() const { return parent_; } 97 const ServerWindow* parent() const { return parent_; }
98 ServerWindow* parent() { return parent_; } 98 ServerWindow* parent() { return parent_; }
99 99
100 const ServerWindow* GetRoot() const; 100 const ServerWindow* GetRoot() const;
101 ServerWindow* GetRoot() { 101 ServerWindow* GetRoot() {
102 return const_cast<ServerWindow*>( 102 return const_cast<ServerWindow*>(
103 const_cast<const ServerWindow*>(this)->GetRoot()); 103 const_cast<const ServerWindow*>(this)->GetRoot());
104 } 104 }
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 base::ObserverList<ServerWindowObserver> observers_; 254 base::ObserverList<ServerWindowObserver> observers_;
255 255
256 DISALLOW_COPY_AND_ASSIGN(ServerWindow); 256 DISALLOW_COPY_AND_ASSIGN(ServerWindow);
257 }; 257 };
258 258
259 } // namespace ws 259 } // namespace ws
260 } // namespace ui 260 } // namespace ui
261 261
262 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ 262 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_
OLDNEW
« no previous file with comments | « services/ui/ws/platform_display.cc ('k') | services/ui/ws/server_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698