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

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

Issue 2696963003: Split cursor location from UserDisplayManager. (Closed)
Patch Set: Fixes. Created 3 years, 10 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
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 1711 matching lines...) Expand 10 before | Expand all | Expand 10 after
1722 window_manager_internal_client_binding_) { 1722 window_manager_internal_client_binding_) {
1723 return; 1723 return;
1724 } 1724 }
1725 window_manager_internal_client_binding_.reset( 1725 window_manager_internal_client_binding_.reset(
1726 new mojo::AssociatedBinding<mojom::WindowManagerClient>( 1726 new mojo::AssociatedBinding<mojom::WindowManagerClient>(
1727 this, std::move(internal))); 1727 this, std::move(internal)));
1728 } 1728 }
1729 1729
1730 void WindowTree::GetCursorLocationMemory( 1730 void WindowTree::GetCursorLocationMemory(
1731 const GetCursorLocationMemoryCallback& callback) { 1731 const GetCursorLocationMemoryCallback& callback) {
1732 callback.Run( 1732 callback.Run(window_server_->display_manager()
1733 window_server_->display_manager()->GetUserDisplayManager(user_id_)-> 1733 ->GetCursorLocationManager(user_id_)
1734 GetCursorLocationMemory()); 1734 ->GetCursorLocationMemory());
1735 } 1735 }
1736 1736
1737 void WindowTree::PerformDragDrop( 1737 void WindowTree::PerformDragDrop(
1738 uint32_t change_id, 1738 uint32_t change_id,
1739 Id source_window_id, 1739 Id source_window_id,
1740 const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data, 1740 const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
1741 uint32_t drag_operation) { 1741 uint32_t drag_operation) {
1742 ServerWindow* window = GetWindowByClientId(ClientWindowId(source_window_id)); 1742 ServerWindow* window = GetWindowByClientId(ClientWindowId(source_window_id));
1743 bool success = window && access_policy_->CanInitiateDragLoop(window); 1743 bool success = window && access_policy_->CanInitiateDragLoop(window);
1744 if (!success || !ShouldRouteToWindowManager(window)) { 1744 if (!success || !ShouldRouteToWindowManager(window)) {
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, 2155 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
2156 effect_bitmask, callback); 2156 effect_bitmask, callback);
2157 } 2157 }
2158 2158
2159 void WindowTree::PerformOnDragDropDone() { 2159 void WindowTree::PerformOnDragDropDone() {
2160 client()->OnDragDropDone(); 2160 client()->OnDragDropDone();
2161 } 2161 }
2162 2162
2163 } // namespace ws 2163 } // namespace ws
2164 } // namespace ui 2164 } // namespace ui
OLDNEW
« services/ui/ws/display_manager.h ('K') | « services/ui/ws/window_manager_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698