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

Side by Side Diff: services/ui/ws/server_window.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, 7 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_default.cc ('k') | services/ui/ws/test_utils.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 #include "services/ui/ws/server_window.h" 5 #include "services/ui/ws/server_window.h"
6 6
7 #include <inttypes.h> 7 #include <inttypes.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 14 matching lines...) Expand all
25 const WindowId& id, 25 const WindowId& id,
26 const Properties& properties) 26 const Properties& properties)
27 : delegate_(delegate), 27 : delegate_(delegate),
28 id_(id), 28 id_(id),
29 frame_sink_id_(WindowIdToTransportId(id), 0), 29 frame_sink_id_(WindowIdToTransportId(id), 0),
30 parent_(nullptr), 30 parent_(nullptr),
31 stacking_target_(nullptr), 31 stacking_target_(nullptr),
32 transient_parent_(nullptr), 32 transient_parent_(nullptr),
33 modal_type_(MODAL_TYPE_NONE), 33 modal_type_(MODAL_TYPE_NONE),
34 visible_(false), 34 visible_(false),
35 // Default to POINTER as CURSOR_NULL doesn't change the cursor, it leaves 35 // Default to kPointer as kNull doesn't change the cursor, it leaves
36 // the last non-null cursor. 36 // the last non-null cursor.
37 cursor_id_(mojom::CursorType::POINTER), 37 cursor_id_(mojom::CursorType::kPointer),
38 non_client_cursor_id_(mojom::CursorType::POINTER), 38 non_client_cursor_id_(mojom::CursorType::kPointer),
39 opacity_(1), 39 opacity_(1),
40 can_focus_(true), 40 can_focus_(true),
41 properties_(properties), 41 properties_(properties),
42 // Don't notify newly added observers during notification. This causes 42 // Don't notify newly added observers during notification. This causes
43 // problems for code that adds an observer as part of an observer 43 // problems for code that adds an observer as part of an observer
44 // notification (such as ServerWindowDrawTracker). 44 // notification (such as ServerWindowDrawTracker).
45 observers_( 45 observers_(
46 base::ObserverList<ServerWindowObserver>::NOTIFY_EXISTING_ONLY) { 46 base::ObserverList<ServerWindowObserver>::NOTIFY_EXISTING_ONLY) {
47 DCHECK(delegate); // Must provide a delegate. 47 DCHECK(delegate); // Must provide a delegate.
48 } 48 }
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 window->OnStackingChanged(); 471 window->OnStackingChanged();
472 } 472 }
473 473
474 // static 474 // static
475 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { 475 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) {
476 return &window->stacking_target_; 476 return &window->stacking_target_;
477 } 477 }
478 478
479 } // namespace ws 479 } // namespace ws
480 } // namespace ui 480 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/platform_display_default.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698