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

Side by Side Diff: services/ui/ws/window_tree.cc

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/window_tree.h ('k') | services/ui/ws/window_tree_unittest.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/window_tree.h" 5 #include "services/ui/ws/window_tree.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 return; 692 return;
693 693
694 ClientWindowId client_window_id; 694 ClientWindowId client_window_id;
695 if (IsWindowKnown(window, &client_window_id)) { 695 if (IsWindowKnown(window, &client_window_id)) {
696 client()->OnWindowOpacityChanged(client_window_id.id, old_opacity, 696 client()->OnWindowOpacityChanged(client_window_id.id, old_opacity,
697 new_opacity); 697 new_opacity);
698 } 698 }
699 } 699 }
700 700
701 void WindowTree::ProcessCursorChanged(const ServerWindow* window, 701 void WindowTree::ProcessCursorChanged(const ServerWindow* window,
702 int32_t cursor_id, 702 mojom::Cursor cursor_id,
703 bool originated_change) { 703 bool originated_change) {
704 if (originated_change) 704 if (originated_change)
705 return; 705 return;
706 ClientWindowId client_window_id; 706 ClientWindowId client_window_id;
707 if (!IsWindowKnown(window, &client_window_id)) 707 if (!IsWindowKnown(window, &client_window_id))
708 return; 708 return;
709 709
710 client()->OnWindowPredefinedCursorChanged(client_window_id.id, 710 client()->OnWindowPredefinedCursorChanged(client_window_id.id, cursor_id);
711 mojom::Cursor(cursor_id));
712 } 711 }
713 712
714 void WindowTree::ProcessFocusChanged(const ServerWindow* old_focused_window, 713 void WindowTree::ProcessFocusChanged(const ServerWindow* old_focused_window,
715 const ServerWindow* new_focused_window) { 714 const ServerWindow* new_focused_window) {
716 if (window_server_->current_operation_type() == OperationType::SET_FOCUS && 715 if (window_server_->current_operation_type() == OperationType::SET_FOCUS &&
717 window_server_->IsOperationSource(id_)) { 716 window_server_->IsOperationSource(id_)) {
718 return; 717 return;
719 } 718 }
720 const ServerWindow* window = 719 const ServerWindow* window =
721 new_focused_window 720 new_focused_window
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1906 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, 1905 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
1907 effect_bitmask, callback); 1906 effect_bitmask, callback);
1908 } 1907 }
1909 1908
1910 void WindowTree::PerformOnDragDropDone() { 1909 void WindowTree::PerformOnDragDropDone() {
1911 client()->OnDragDropDone(); 1910 client()->OnDragDropDone();
1912 } 1911 }
1913 1912
1914 } // namespace ws 1913 } // namespace ws
1915 } // namespace ui 1914 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_tree.h ('k') | services/ui/ws/window_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698